summaryrefslogtreecommitdiffstats
path: root/src/Client/UserCommands.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Client/UserCommands.cpp')
-rw-r--r--src/Client/UserCommands.cpp180
1 files changed, 90 insertions, 90 deletions
diff --git a/src/Client/UserCommands.cpp b/src/Client/UserCommands.cpp
index a1d190a..5e55534 100644
--- a/src/Client/UserCommands.cpp
+++ b/src/Client/UserCommands.cpp
@@ -31,7 +31,7 @@
namespace Mad {
namespace Client {
-std::string UserCommands::getUserName(CommandParser *commandParser, unsigned long uid, bool withId) {
+Core::String UserCommands::getUserName(CommandParser *commandParser, unsigned long uid, bool withId) {
std::ostringstream stream;
try {
@@ -47,10 +47,10 @@ std::string UserCommands::getUserName(CommandParser *commandParser, unsigned lon
stream << ")";
}
- return stream.str();
+ return stream.str().c_str();
}
-std::string UserCommands::getGroupName(CommandParser *commandParser, unsigned long gid, bool withId) {
+Core::String UserCommands::getGroupName(CommandParser *commandParser, unsigned long gid, bool withId) {
std::ostringstream stream;
try {
@@ -66,10 +66,10 @@ std::string UserCommands::getGroupName(CommandParser *commandParser, unsigned lo
stream << ")";
}
- return stream.str();
+ return stream.str().c_str();
}
-void UserCommands::listUsersCommand(CommandParser *commandParser, const std::vector<std::string> &/*args*/) {
+void UserCommands::listUsersCommand(CommandParser *commandParser, const std::vector<Core::String> &/*args*/) {
try {
boost::shared_ptr<const std::map<unsigned long, Common::UserInfo> > users = commandParser->application->getUserManager()->getUserList();
@@ -93,7 +93,7 @@ void UserCommands::listUsersCommand(CommandParser *commandParser, const std::vec
}
}
-void UserCommands::userInfoCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::userInfoCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() == 1) {
std::cerr << args[0] << ": No user id given." << std::endl;
commandParser->printUsage("user_info");
@@ -107,11 +107,11 @@ void UserCommands::userInfoCommand(CommandParser *commandParser, const std::vect
try {
char *endptr;
- unsigned long uid = std::strtoul(args[1].c_str(), &endptr, 10);
+ unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
boost::shared_ptr<const Common::UserInfo> userInfo;
- if(args[1].empty() || *endptr != '\0') {
+ if(args[1].isEmpty() || *endptr != '\0') {
userInfo = commandParser->application->getUserManager()->getUserInfoByName(args[1]);
}
else
@@ -136,7 +136,7 @@ void UserCommands::userInfoCommand(CommandParser *commandParser, const std::vect
}
}
-void UserCommands::listGroupsCommand(CommandParser *commandParser, const std::vector<std::string> &/*args*/) {
+void UserCommands::listGroupsCommand(CommandParser *commandParser, const std::vector<Core::String> &/*args*/) {
try {
boost::shared_ptr<const std::map<unsigned long, Common::GroupInfo> > groups = commandParser->application->getUserManager()->getGroupList();
@@ -158,31 +158,31 @@ void UserCommands::listGroupsCommand(CommandParser *commandParser, const std::ve
}
}
-void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() == 1) {
- std::cerr << args[0] << ": No group id given." << std::endl;
+ std::cerr << args[0].extract() << ": No group id given." << std::endl;
commandParser->printUsage("group_info");
return;
}
if(args.size() > 2) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("group_info");
return;
}
try {
char *endptr;
- unsigned long gid = std::strtoul(args[1].c_str(), &endptr, 10);
+ unsigned long gid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
boost::shared_ptr<const Common::GroupInfo> groupInfo;
- if(args[1].empty() || *endptr != '\0') {
+ if(args[1].isEmpty() || *endptr != '\0') {
groupInfo = commandParser->application->getUserManager()->getGroupInfoByName(args[1]);
}
else
groupInfo = commandParser->application->getUserManager()->getGroupInfo(gid);
- std::cout << " Group name: " << groupInfo->getName() << " (" << groupInfo->getGid() << ")" << std::endl << std::endl;
+ std::cout << " Group name: " << groupInfo->getName().extract() << " (" << groupInfo->getGid() << ")" << std::endl << std::endl;
boost::shared_ptr<const std::set<unsigned long> > users = commandParser->application->getUserManager()->getGroupUserList(groupInfo->getGid());
@@ -191,7 +191,7 @@ void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vec
for(std::set<unsigned long>::const_iterator user = users->begin(); user != users->end(); ++user)
- std::cout << " " << getUserName(commandParser, *user, true) << std::endl;
+ std::cout << " " << getUserName(commandParser, *user, true).extract() << std::endl;
std::cout << std::endl;
}
@@ -201,29 +201,29 @@ void UserCommands::groupInfoCommand(CommandParser *commandParser, const std::vec
}
}
-void UserCommands::addUserCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::addUserCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 5) {
- std::cerr << args[0] << ": Too few arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
commandParser->printUsage("add_user");
return;
}
if(args.size() > 5) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("add_user");
return;
}
char *endptr;
- unsigned long uid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse user id." << std::endl;
+ unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
commandParser->printUsage("add_user");
return;
}
- unsigned long gid = std::strtoul(args[2].c_str(), &endptr, 10);
- if(args[2].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse group id." << std::endl;
+ unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+ if(args[2].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
commandParser->printUsage("add_user");
return;
}
@@ -242,36 +242,36 @@ void UserCommands::addUserCommand(CommandParser *commandParser, const std::vecto
}
}
-void UserCommands::updateUserCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::updateUserCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 6) {
- std::cerr << args[0] << ": Too few arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
commandParser->printUsage("update_user");
return;
}
if(args.size() > 6) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("update_user");
return;
}
char *endptr;
- unsigned long origUid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse the old user id." << std::endl;
+ unsigned long origUid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse the old user id." << std::endl;
commandParser->printUsage("update_user");
return;
}
- unsigned long uid = std::strtoul(args[2].c_str(), &endptr, 10);
- if(args[2].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse the new user id." << std::endl;
+ unsigned long uid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+ if(args[2].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse the new user id." << std::endl;
commandParser->printUsage("update_user");
return;
}
- unsigned long gid = std::strtoul(args[3].c_str(), &endptr, 10);
- if(args[3].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse group id." << std::endl;
+ unsigned long gid = std::strtoul(args[3].extract().c_str(), &endptr, 10);
+ if(args[3].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
commandParser->printUsage("update_user");
return;
}
@@ -290,22 +290,22 @@ void UserCommands::updateUserCommand(CommandParser *commandParser, const std::ve
}
}
-void UserCommands::deleteUserCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::deleteUserCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 2) {
- std::cerr << args[0] << ": No user id given." << std::endl;
+ std::cerr << args[0].extract() << ": No user id given." << std::endl;
commandParser->printUsage("delete_user");
return;
}
if(args.size() > 2) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("delete_user");
return;
}
char *endptr;
- unsigned long uid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse user id." << std::endl;
+ unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
commandParser->printUsage("delete_user");
return;
}
@@ -320,22 +320,22 @@ void UserCommands::deleteUserCommand(CommandParser *commandParser, const std::ve
}
}
-void UserCommands::addGroupCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::addGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 3) {
- std::cerr << args[0] << ": Too few arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
commandParser->printUsage("add_group");
return;
}
if(args.size() > 3) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("add_group");
return;
}
char *endptr;
- unsigned long gid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[2].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse group id." << std::endl;
+ unsigned long gid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[2].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
commandParser->printUsage("add_group");
return;
}
@@ -350,29 +350,29 @@ void UserCommands::addGroupCommand(CommandParser *commandParser, const std::vect
}
}
-void UserCommands::updateGroupCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::updateGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 4) {
- std::cerr << args[0] << ": Too few arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
commandParser->printUsage("update_group");
return;
}
if(args.size() > 4) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("update_group");
return;
}
char *endptr;
- unsigned long origGid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse the old group id." << std::endl;
+ unsigned long origGid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse the old group id." << std::endl;
commandParser->printUsage("update_group");
return;
}
- unsigned long gid = std::strtoul(args[2].c_str(), &endptr, 10);
- if(args[2].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse the new group id." << std::endl;
+ unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+ if(args[2].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse the new group id." << std::endl;
commandParser->printUsage("update_group");
return;
}
@@ -387,22 +387,22 @@ void UserCommands::updateGroupCommand(CommandParser *commandParser, const std::v
}
}
-void UserCommands::deleteGroupCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::deleteGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 2) {
- std::cerr << args[0] << ": No group id given." << std::endl;
+ std::cerr << args[0].extract() << ": No group id given." << std::endl;
commandParser->printUsage("delete_group");
return;
}
if(args.size() > 2) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("delete_group");
return;
}
char *endptr;
- unsigned long gid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse group id." << std::endl;
+ unsigned long gid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
commandParser->printUsage("delete_group");
return;
}
@@ -417,29 +417,29 @@ void UserCommands::deleteGroupCommand(CommandParser *commandParser, const std::v
}
}
-void UserCommands::addUserToGroupCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::addUserToGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 3) {
- std::cerr << args[0] << ": Too few arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
commandParser->printUsage("add_user_to_group");
return;
}
if(args.size() > 3) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("add_user_to_group");
return;
}
char *endptr;
- unsigned long uid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse user id." << std::endl;
+ unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
commandParser->printUsage("add_user_to_group");
return;
}
- unsigned long gid = std::strtoul(args[2].c_str(), &endptr, 10);
- if(args[2].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse group id." << std::endl;
+ unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+ if(args[2].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
commandParser->printUsage("add_user_to_group");
return;
}
@@ -454,29 +454,29 @@ void UserCommands::addUserToGroupCommand(CommandParser *commandParser, const std
}
}
-void UserCommands::deleteUserFromGroupCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::deleteUserFromGroupCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 3) {
- std::cerr << args[0] << ": Too few arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
commandParser->printUsage("delete_user_from_group");
return;
}
if(args.size() > 3) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("delete_user_from_group");
return;
}
char *endptr;
- unsigned long uid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse user id." << std::endl;
+ unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
commandParser->printUsage("delete_user_from_group");
return;
}
- unsigned long gid = std::strtoul(args[2].c_str(), &endptr, 10);
- if(args[2].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse group id." << std::endl;
+ unsigned long gid = std::strtoul(args[2].extract().c_str(), &endptr, 10);
+ if(args[2].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse group id." << std::endl;
commandParser->printUsage("delete_user_from_group");
return;
}
@@ -491,28 +491,28 @@ void UserCommands::deleteUserFromGroupCommand(CommandParser *commandParser, cons
}
}
-void UserCommands::setPasswordCommand(CommandParser *commandParser, const std::vector<std::string> &args) {
+void UserCommands::setPasswordCommand(CommandParser *commandParser, const std::vector<Core::String> &args) {
if(args.size() < 2) {
- std::cerr << args[0] << ": Too few arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too few arguments." << std::endl;
commandParser->printUsage("set_password");
return;
}
if(args.size() > 2) {
- std::cerr << args[0] << ": Too many arguments." << std::endl;
+ std::cerr << args[0].extract() << ": Too many arguments." << std::endl;
commandParser->printUsage("set_password");
return;
}
char *endptr;
- unsigned long uid = std::strtoul(args[1].c_str(), &endptr, 10);
- if(args[1].empty() || *endptr != '\0') {
- std::cerr << args[0] << ": Unable to parse user id." << std::endl;
+ unsigned long uid = std::strtoul(args[1].extract().c_str(), &endptr, 10);
+ if(args[1].isEmpty() || *endptr != '\0') {
+ std::cerr << args[0].extract() << ": Unable to parse user id." << std::endl;
commandParser->printUsage("set_password");
return;
}
- std::string password = PasswordReader::readPassword("Password: ");
- std::string password2 = PasswordReader::readPassword("Verify password: ");
+ Core::String password = PasswordReader::readPassword("Password: ");
+ Core::String password2 = PasswordReader::readPassword("Verify password: ");
if(password != password2) {
std::cerr << "Passwords do not match." << std::endl;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 04:46:55 +0200