Skip to content
Permalink
Browse files

Update log messages.

  • Loading branch information...
kohler committed Oct 8, 2019
1 parent 365009b commit bbd89aae118b1605ba7aca093398765a9b043204
Showing with 8 additions and 8 deletions.
  1. +1 −1 lib/login.php
  2. +2 −2 mergeaccounts.php
  3. +1 −1 profile.php
  4. +3 −3 src/contact.php
  5. +1 −1 src/userstatus.php
@@ -140,7 +140,7 @@ static function login_redirect(Conf $conf, Qrequest $qreq) {
$conf->confirmMsg("A password reset link has been emailed to " . htmlspecialchars($qreq->email) . ". When you receive that email, follow its instructions to create a new password.");
} else if ($worked) {
$conf->confirmMsg("Your password has been emailed to " . htmlspecialchars($qreq->email) . ". When you receive that email, return here to sign in.");
$conf->log_for($xuser, null, "Sent password");
$conf->log_for($xuser, null, "Password sent");
}
return null;
}
@@ -34,10 +34,10 @@ function crpmerge($qreq, $MiniMe) {
if (!$merger->has_error()) {
$Conf->confirmMsg("Merged account " . htmlspecialchars($merger->oldu->email) . ".");
$merger->newu->log_activity("Merged account " . $merger->oldu->email);
$merger->newu->log_activity("Account merged " . $merger->oldu->email);
go(hoturl("index"));
} else {
$merger->newu->log_activity("Merged account " . $merger->oldu->email . " with errors");
$merger->newu->log_activity("Account merged " . $merger->oldu->email . " with errors");
$MergeError = '<div class="multimessage">'
. join("\n", array_map(function ($m) { return '<div class="mmm">' . $m . '</div>'; },
$merger->errors()))
@@ -412,7 +412,7 @@ function textArrayPapers($pids) {
$Conf->invalidate_caches(["pc" => 1]);
// done
$Conf->confirmMsg("Permanently deleted account " . htmlspecialchars($Acct->email) . ".");
$Me->log_activity_for($Acct, "Permanently deleted account " . htmlspecialchars($Acct->email));
$Me->log_activity_for($Acct, "Account deleted " . htmlspecialchars($Acct->email));
go(hoturl("users", "t=all"));
}
}
@@ -1295,8 +1295,8 @@ static function create(Conf $conf, $actor, $reg, $flags = 0, $roles = 0) {
if (($flags & self::SAVE_NOTIFY) && !$u->is_disabled()) {
$u->sendAccountInfo("create", false);
}
$type = $u->is_disabled() ? "disabled " : "";
$conf->log_for($actor && $actor->has_email() ? $actor : $u, $u, "Created {$type}account");
$type = $u->is_disabled() ? " disabled" : "";
$conf->log_for($actor && $actor->has_email() ? $actor : $u, $u, "Account created" . $type);
}
return $u;
@@ -1591,7 +1591,7 @@ function sendAccountInfo($sendtype, $sensitive) {
}
$capmgr = $this->conf->capability_manager($cdbu ? "U" : null);
$rest["capability"] = $capmgr->create(CAPTYPE_RESETPASSWORD, array("user" => $this, "timeExpires" => time() + 259200));
$this->conf->log_for($this, null, "Created password reset " . substr($rest["capability"], 0, 8) . "...");
$this->conf->log_for($this, null, "Password link sent " . substr($rest["capability"], 0, 8) . "...");
$template = "@resetpassword";
}
} else {
@@ -723,7 +723,7 @@ function save($cj, $old_user = null) {
$user->mark_activity();
}
if (!empty($this->diffs)) {
$user->conf->log_for($this->viewer, $user, "Updated profile " . join(", ", array_keys($this->diffs)));
$user->conf->log_for($this->viewer, $user, "Account edited " . join(", ", array_keys($this->diffs)));
}
return $user;
}

0 comments on commit bbd89aa

Please sign in to comment.
You can’t perform that action at this time.