X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FUser.php;h=bff5db74323977038bf5dc230e670ab993a39032;hb=15caf4b3f7eacda399a56b1ad8eeb9d3257306d9;hp=5c75353a68162b3bca6735e40272e69a4a91fb4e;hpb=d950a3241bb690b6143d8aa43b37f36ee7c66197;p=friendica.git

diff --git a/src/Console/User.php b/src/Console/User.php
index 5c75353a68..bff5db7432 100644
--- a/src/Console/User.php
+++ b/src/Console/User.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -59,14 +59,15 @@ console user - Modify user settings per console commands.
 Usage
 	bin/console user password <nickname> [<password>] [-h|--help|-?] [-v]
 	bin/console user add [<name> [<nickname> [<email> [<language>]]]] [-h|--help|-?] [-v]
-	bin/console user delete [<nickname>] [-q] [-h|--help|-?] [-v]
+	bin/console user delete [<nickname>] [-y] [-h|--help|-?] [-v]
 	bin/console user allow [<nickname>] [-h|--help|-?] [-v]
 	bin/console user deny [<nickname>] [-h|--help|-?] [-v]
 	bin/console user block [<nickname>] [-h|--help|-?] [-v]
 	bin/console user unblock [<nickname>] [-h|--help|-?] [-v]
-	bin/console user list pending [start=0 [count=50]] [-h|--help|-?] [-v]
-	bin/console user list removed [start=0 [count=50]] [-h|--help|-?] [-v]
-	bin/console user list all [start=0 [count=50]] [-h|--help|-?] [-v]
+	bin/console user list pending [-s|--start=0] [-c|--count=50] [-h|--help|-?] [-v]
+	bin/console user list removed [-s|--start=0] [-c|--count=50] [-h|--help|-?] [-v]
+	bin/console user list active [-s|--start=0] [-c|--count=50] [-h|--help|-?] [-v]
+	bin/console user list all [-s|--start=0] [-c|--count=50] [-h|--help|-?] [-v]
 	bin/console user search id <UID> [-h|--help|-?] [-v]
 	bin/console user search nick <nick> [-h|--help|-?] [-v]
 	bin/console user search mail <mail> [-h|--help|-?] [-v]
@@ -77,8 +78,8 @@ Description
 
 Options
     -h|--help|-? Show help information
-    -v           Show more debug information.
-    -q           Quiet mode (don't ask for a command).
+    -v           Show more debug information
+    -y           Non-interactive mode, assume "yes" as answer to the user deletion prompt
 HELP;
 		return $help;
 	}
@@ -303,19 +304,24 @@ HELP;
 			}
 		}
 
-		$user = $this->dba->selectFirst('user', ['uid'], ['nickname' => $nick]);
+		$user = $this->dba->selectFirst('user', ['uid', 'account_removed'], ['nickname' => $nick]);
 		if (empty($user)) {
 			throw new RuntimeException($this->l10n->t('User not found'));
 		}
 
-		if (!$this->getOption('q')) {
+		if (!empty($user['account_removed'])) {
+			$this->out($this->l10n->t('User has already been marked for deletion.'));
+			return true;
+		}
+
+		if (!$this->getOption('y')) {
 			$this->out($this->l10n->t('Type "yes" to delete %s', $nick));
 			if (CliPrompt::prompt() !== 'yes') {
-				throw new RuntimeException('Delete abort.');
+				throw new RuntimeException($this->l10n->t('Deletion aborted.'));
 			}
 		}
 
-		return UserModel::remove($user['uid'] ?? -1);
+		return UserModel::remove($user['uid']);
 	}
 
 	/**
@@ -326,8 +332,8 @@ HELP;
 	private function listUser()
 	{
 		$subCmd = $this->getArgument(1);
-		$start = $this->getArgument(2, 0);
-		$count = $this->getArgument(3, Pager::ITEMS_PER_PAGE);
+		$start = $this->getOption(['s', 'start'], 0);
+		$count = $this->getOption(['c', 'count'], Pager::ITEMS_PER_PAGE);
 
 		$table = new Console_Table();
 
@@ -348,15 +354,11 @@ HELP;
 				$this->out($table->getTable());
 				return true;
 			case 'all':
+			case 'active':
 			case 'removed':
 				$table->setHeaders(['Nick', 'Name', 'URL', 'E-Mail', 'Register', 'Login', 'Last Item']);
-				$contacts = UserModel::getUsers($start, $count);
+				$contacts = UserModel::getList($start, $count, $subCmd);
 				foreach ($contacts as $contact) {
-					if (($subCmd != 'removed') && !empty($contact['account_removed']) ||
-					    ($subCmd == 'removed') && empty($contact['account_removed'])) {
-						continue;
-					}
-
 					$table->addRow([
 						$contact['nick'],
 						$contact['name'],
@@ -364,7 +366,7 @@ HELP;
 						$contact['email'],
 						Temporal::getRelativeDate($contact['created']),
 						Temporal::getRelativeDate($contact['login_date']),
-						Temporal::getRelativeDate($contact['lastitem_date']),
+						Temporal::getRelativeDate($contact['last-item']),
 					]);
 				}
 				$this->out($table->getTable());
@@ -407,7 +409,7 @@ HELP;
 			case 'guid':
 				$user = UserModel::getByGuid($param, $fields);
 				break;
-			case 'email':
+			case 'mail':
 				$user = UserModel::getByEmail($param, $fields);
 				break;
 			case 'nick':