Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

2 files changed, 33 insertions, 6 deletions

diff --git a/plugins/OStatus/locale/OStatus.po b/plugins/OStatus/locale/OStatus.pot
index 7e33a0eed..7e33a0eed 100644
--- a/plugins/OStatus/locale/OStatus.po
+++ b/plugins/OStatus/locale/OStatus.pot
diff --git a/plugins/OStatus/scripts/fixup-shadow.php b/plugins/OStatus/scripts/fixup-shadow.php
index ec014c787..6522ca240 100644
--- a/plugins/OStatus/scripts/fixup-shadow.php
+++ b/plugins/OStatus/scripts/fixup-shadow.php
@@ -50,20 +50,47 @@ $encGroup = str_replace($marker, '%', $encGroup);
 $sql = "SELECT * FROM ostatus_profile WHERE uri LIKE '%s' OR uri LIKE '%s'";
 $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()) {
-    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) {
-        echo " (unchanged)\n";
+        echo " - skipping\n";
     } else {
-        echo " removing bogus ostatus_profile entry...";
+        echo " - removing bogus ostatus_profile entry...";
         $evil = clone($oprofile);
         $evil->delete();
         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";
+}