Clean up and clarify output on fix-shadow.php

This commit is contained in:
Brion Vibber 2010-04-05 11:20:35 -07:00
parent 2a489018b1
commit dbaa93d1aa

View File

@ -50,20 +50,47 @@ $encGroup = str_replace($marker, '%', $encGroup);
$sql = "SELECT * FROM ostatus_profile WHERE uri LIKE '%s' OR uri LIKE '%s'"; $sql = "SELECT * FROM ostatus_profile WHERE uri LIKE '%s' OR uri LIKE '%s'";
$oprofile->query(sprintf($sql, $encProfile, $encGroup)); $oprofile->query(sprintf($sql, $encProfile, $encGroup));
echo "Found $oprofile->N bogus ostatus_profile entries for local users and groups:\n"; $count = $oprofile->N;
echo "Found $count bogus ostatus_profile entries shadowing local users and groups:\n";
while ($oprofile->fetch()) { while ($oprofile->fetch()) {
echo "$oprofile->uri"; $uri = $oprofile->uri;
if (preg_match('!/group/(\d+)/id!', $oprofile->uri, $matches)) {
$id = intval($matches[1]);
$group = Local_group::staticGet('group_id', $id);
if ($group) {
$nick = $group->nickname;
} else {
$nick = '<deleted>';
}
echo "group $id ($nick) hidden by $uri";
} else if (preg_match('!/user/(\d+)!', $uri, $matches)) {
$id = intval($matches[1]);
$user = User::staticGet('id', $id);
if ($user) {
$nick = $user->nickname;
} else {
$nick = '<deleted>';
}
echo "user $id ($nick) hidden by $uri";
} else {
echo "$uri matched query, but we don't recognize it.\n";
continue;
}
if ($dry) { if ($dry) {
echo " (unchanged)\n"; echo " - skipping\n";
} else { } else {
echo " removing bogus ostatus_profile entry..."; echo " - removing bogus ostatus_profile entry...";
$evil = clone($oprofile); $evil = clone($oprofile);
$evil->delete(); $evil->delete();
echo " ok\n"; echo " ok\n";
} }
} }
echo "done.\n"; if ($count && $dry) {
echo "NO CHANGES MADE -- To delete the bogus entries, run again without --dry-run option.\n";
} else {
echo "done.\n";
}