make fixup_utf8.php handle profiles and groups too

diff --git a/scripts/fixup_utf8.php b/scripts/fixup_utf8.php
index 925da24844517f231f3ea82e90f01ede132c26ad..2046d2b770a6ea34fc61c02ea174d29bfd61fe87 100644 (file)
--- a/scripts/fixup_utf8.php
+++ b/scripts/fixup_utf8.php
@@ -35,116 +35,273 @@ define('LACONICA', true);
 require_once(INSTALLDIR . '/lib/common.php');
 require_once('DB.php');
 
-function fixup_utf8($max_id, $min_id) {
+class UTF8FixerUpper
+{
+    var $dbl = null;
+    var $dbu = null;
+    var $args = array();
+
+    function __construct($args)
+    {
+        $this->args = $args;
+
+        if (array_key_exists('max_date', $args)) {
+            $this->max_date = strftime('%Y-%m-%d %H:%M:%S', strtotime($args['max_date']));
+        } else {
+            $this->max_date = strftime('%Y-%m-%d %H:%M:%S', time());
+        }
 
-    $dbl = doConnect('latin1');
+        $this->dbl = $this->doConnect('latin1');
 
-    if (empty($dbl)) {
-        return;
-    }
+        if (empty($this->dbl)) {
+            return;
+        }
 
-    $dbu = doConnect('utf8');
+        $this->dbu = $this->doConnect('utf8');
 
-    if (empty($dbu)) {
-        return;
+        if (empty($this->dbu)) {
+            return;
+        }
     }
 
-    // Do a separate DB connection
+    function doConnect($charset)
+    {
+        $db = DB::connect(common_config('db', 'database'),
+                          array('persistent' => false));
 
-    $sth = $dbu->prepare("UPDATE notice SET content = UNHEX(?), rendered = UNHEX(?) WHERE id = ?");
+        if (PEAR::isError($db)) {
+            echo "ERROR: " . $db->getMessage() . "\n";
+            return NULL;
+        }
 
-    if (PEAR::isError($sth)) {
-        echo "ERROR: " . $sth->getMessage() . "\n";
-        return;
-    }
+        $conn = $db->connection;
 
-    $sql = 'SELECT id, content, rendered FROM notice ' .
-      'WHERE LENGTH(content) != CHAR_LENGTH(content)';
+        $succ = mysqli_set_charset($conn, $charset);
 
-    if (!empty($max_id)) {
-        $sql .= ' AND id <= ' . $max_id;
-    }
+        if (!$succ) {
+            echo "ERROR: couldn't set charset\n";
+            $db->disconnect();
+            return NULL;
+        }
 
-    if (!empty($min_id)) {
-        $sql .= ' AND id >= ' . $min_id;
-    }
+        $result = $db->autoCommit(true);
 
-    $sql .= ' ORDER BY id DESC';
+        if (PEAR::isError($result)) {
+            echo "ERROR: " . $result->getMessage() . "\n";
+            $db->disconnect();
+            return NULL;
+        }
 
-    $rn = $dbl->query($sql);
+        return $db;
+    }
 
-    if (PEAR::isError($rn)) {
-        echo "ERROR: " . $rn->getMessage() . "\n";
-        return;
+    function fixup()
+    {
+        $this->fixupNotices($this->args['max_notice'],
+                            $this->args['min_notice']);
+        $this->fixupProfiles();
+        $this->fixupGroups();
     }
 
-    echo "Number of rows: " . $rn->numRows() . "\n";
+    function fixupNotices($max_id, $min_id) {
 
-    $notice = array();
+        // Do a separate DB connection
 
-    while (DB_OK == $rn->fetchInto($notice)) {
+        $sth = $this->dbu->prepare("UPDATE notice SET content = UNHEX(?), rendered = UNHEX(?) WHERE id = ?");
 
-        $id = ($notice[0])+0;
-        $content = bin2hex($notice[1]);
-        $rendered = bin2hex($notice[2]);
+        if (PEAR::isError($sth)) {
+            echo "ERROR: " . $sth->getMessage() . "\n";
+            return;
+        }
 
-        echo "$id...";
+        $sql = 'SELECT id, content, rendered FROM notice ' .
+          'WHERE LENGTH(content) != CHAR_LENGTH(content) '.
+          'AND modified < "'.$this->max_date.'" ';
 
-        $result =& $dbu->execute($sth, array($content, $rendered, $id));
+        if (!empty($max_id)) {
+            $sql .= ' AND id <= ' . $max_id;
+        }
 
-        if (PEAR::isError($result)) {
-            echo "ERROR: " . $result->getMessage() . "\n";
-            continue;
+        if (!empty($min_id)) {
+            $sql .= ' AND id >= ' . $min_id;
         }
 
-        $cnt = $dbu->affectedRows();
+        $sql .= ' ORDER BY id DESC';
+
+        $rn = $this->dbl->query($sql);
 
-        if ($cnt != 1) {
-            echo "ERROR: 0 rows affected\n";
-            continue;
+        if (PEAR::isError($rn)) {
+            echo "ERROR: " . $rn->getMessage() . "\n";
+            return;
         }
 
-        $notice = Notice::staticGet('id', $id);
-        $notice->decache();
+        echo "Number of rows: " . $rn->numRows() . "\n";
 
-        echo "OK\n";
-    }
-}
+        $notice = array();
 
-function doConnect($charset)
-{
-    $db = DB::connect(common_config('db', 'database'),
-                      array('persistent' => false));
+        while (DB_OK == $rn->fetchInto($notice)) {
 
-    if (PEAR::isError($db)) {
-        echo "ERROR: " . $db->getMessage() . "\n";
-        return NULL;
-    }
+            $id = ($notice[0])+0;
+            $content = bin2hex($notice[1]);
+            $rendered = bin2hex($notice[2]);
+
+            echo "$id...";
+
+            $result =& $this->dbu->execute($sth, array($content, $rendered, $id));
+
+            if (PEAR::isError($result)) {
+                echo "ERROR: " . $result->getMessage() . "\n";
+                continue;
+            }
 
-//    $result = $db->query("SET NAMES $charset");
+            $cnt = $this->dbu->affectedRows();
 
-    $conn = $db->connection;
+            if ($cnt != 1) {
+                echo "ERROR: 0 rows affected\n";
+                continue;
+            }
 
-    $succ = mysqli_set_charset($conn, $charset);
+            $notice = Notice::staticGet('id', $id);
+            $notice->decache();
 
-    if (!$succ) {
-        echo "ERROR: couldn't set charset\n";
-        $db->disconnect();
-        return NULL;
+            echo "OK\n";
+        }
     }
 
-    $result = $db->autoCommit(true);
+    function fixupProfiles()
+    {
+        // Do a separate DB connection
+
+        $sth = $this->dbu->prepare("UPDATE profile SET ".
+                                   "fullname = UNHEX(?),".
+                                   "location = UNHEX(?), ".
+                                   "bio = UNHEX(?) ".
+                                   "WHERE id = ?");
+
+        if (PEAR::isError($sth)) {
+            echo "ERROR: " . $sth->getMessage() . "\n";
+            return;
+        }
+
+        $sql = 'SELECT id, fullname, location, bio FROM profile ' .
+          'WHERE (LENGTH(fullname) != CHAR_LENGTH(fullname) '.
+          'OR LENGTH(location) != CHAR_LENGTH(location) '.
+          'OR LENGTH(bio) != CHAR_LENGTH(bio)) '.
+          'AND modified < "'.$this->max_date.'" '.
+          ' ORDER BY modified DESC';
+
+        $rn = $this->dbl->query($sql);
+
+        if (PEAR::isError($rn)) {
+            echo "ERROR: " . $rn->getMessage() . "\n";
+            return;
+        }
 
-    if (PEAR::isError($result)) {
-        echo "ERROR: " . $result->getMessage() . "\n";
-        $db->disconnect();
-        return NULL;
+        echo "Number of rows: " . $rn->numRows() . "\n";
+
+        $profile = array();
+
+        while (DB_OK == $rn->fetchInto($profile)) {
+
+            $id = ($profile[0])+0;
+            $fullname = bin2hex($profile[1]);
+            $location = bin2hex($profile[2]);
+            $bio = bin2hex($profile[3]);
+
+            echo "$id...";
+
+            $result =& $this->dbu->execute($sth, array($fullname, $location, $bio, $id));
+
+            if (PEAR::isError($result)) {
+                echo "ERROR: " . $result->getMessage() . "\n";
+                continue;
+            }
+
+            $cnt = $this->dbu->affectedRows();
+
+            if ($cnt != 1) {
+                echo "ERROR: 0 rows affected\n";
+                continue;
+            }
+
+            $profile = Profile::staticGet('id', $id);
+            $profile->decache();
+
+            echo "OK\n";
+        }
     }
 
-    return $db;
+    function fixupGroups()
+    {
+        // Do a separate DB connection
+
+        $sth = $this->dbu->prepare("UPDATE user_group SET ".
+                                   "fullname = UNHEX(?),".
+                                   "location = UNHEX(?), ".
+                                   "description = UNHEX(?) ".
+                                   "WHERE id = ?");
+
+        if (PEAR::isError($sth)) {
+            echo "ERROR: " . $sth->getMessage() . "\n";
+            return;
+        }
+
+        $sql = 'SELECT id, fullname, location, description FROM user_group ' .
+          'WHERE LENGTH(fullname) != CHAR_LENGTH(fullname) '.
+          'OR LENGTH(location) != CHAR_LENGTH(location) '.
+          'OR LENGTH(description) != CHAR_LENGTH(description) ';
+          'AND modified < "'.$this->max_date.'" '.
+          'ORDER BY modified DESC';
+
+        $rn = $this->dbl->query($sql);
+
+        if (PEAR::isError($rn)) {
+            echo "ERROR: " . $rn->getMessage() . "\n";
+            return;
+        }
+
+        echo "Number of rows: " . $rn->numRows() . "\n";
+
+        $user_group = array();
+
+        while (DB_OK == $rn->fetchInto($user_group)) {
+
+            $id = ($user_group[0])+0;
+            $fullname = bin2hex($user_group[1]);
+            $location = bin2hex($user_group[2]);
+            $description = bin2hex($user_group[3]);
+
+            echo "$id...";
+
+            $result =& $this->dbu->execute($sth, array($fullname, $location, $description, $id));
+
+            if (PEAR::isError($result)) {
+                echo "ERROR: " . $result->getMessage() . "\n";
+                continue;
+            }
+
+            $cnt = $this->dbu->affectedRows();
+
+            if ($cnt != 1) {
+                echo "ERROR: 0 rows affected\n";
+                continue;
+            }
+
+            $user_group = User_group::staticGet('id', $id);
+            $user_group->decache();
+
+            echo "OK\n";
+        }
+    }
 }
 
-$max_id = ($argc > 1) ? $argv[1] : null;
-$min_id = ($argc > 2) ? $argv[2] : null;
+$max_date = ($argc > 1) ? $argv[1] : null;
+$max_id = ($argc > 2) ? $argv[2] : null;
+$min_id = ($argc > 3) ? $argv[3] : null;
+
+$fixer = new UTF8FixerUpper(array('max_date' => $max_date,
+                                  'max_notice' => $max_id,
+                                  'min_notice' => $min_id));
+
+$fixer->fixup();
 
-fixup_utf8($max_id, $min_id);