GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Some fixes from debugging of bookmark plugin URI foramt

Browse Source 
Tightened up the URI format, fixed some auto-loading issues,
and forced the url_crc32 column to be unsigned.
This commit is contained in:
Evan Prodromou 2010-12-26 21:11:27 -08:00
parent ca28140107
commit 7d56f1cd19
2 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/Bookmark/Bookmark.php
View File

@ -71,6 +71,24 @@ class Bookmark extends Memcached_DataObject
return Memcached_DataObject::staticGet('Bookmark', $k, $v); return Memcached_DataObject::staticGet('Bookmark', $k, $v);
} }
/**
* Get an instance by compound key
*
* This is a utility method to get a single instance with a given set of
* key-value pairs. Usually used for the primary key for a compound key; thus
* the name.
*
* @param array $kv array of key-value mappings
*
* @return Bookmark object found, or null for no hits
*
*/
function pkeyGet($kv)
{
return Memcached_DataObject::pkeyGet('Bookmark', $kv);
}
/** /**
* return table definition for DB_DataObject * return table definition for DB_DataObject
* *
@ -219,21 +237,32 @@ class Bookmark extends Memcached_DataObject
$nb->title = $title; $nb->title = $title;
$nb->description = $description; $nb->description = $description;
$nb->url_crc32 = crc32($nb->url); $nb->url_crc32 = crc32($nb->url);
if (array_key_exists('created', $options)) {
$nb->created = $options['created'];
} else {
$nb->created = common_sql_now(); $nb->created = common_sql_now();
}
if (array_key_exists('uri', $options)) { if (array_key_exists('uri', $options)) {
$nb->uri = $options['uri']; $nb->uri = $options['uri'];
} else { } else {
$dt = new DateTime($nb->created); $dt = new DateTime($nb->created, new DateTimeZone('UTC'));
// I posit that it's sufficiently impossible // I posit that it's sufficiently impossible
// for the same user to generate two CRC-32-clashing // for the same user to generate two CRC-32-clashing
// URLs in the same second that this is a safe unique identifier. // URLs in the same second that this is a safe unique identifier.
// If you find a real counterexample, contact me at acct:evan@status.net // If you find a real counterexample, contact me at acct:evan@status.net
// and I will publicly apologize for my hubris. // and I will publicly apologize for my hubris.
$created = $dt->format('YmdHis');
$crc32 = sprintf('%08x', $nb->url_crc32);
$nb->uri = common_local_url('showbookmark', $nb->uri = common_local_url('showbookmark',
array('user' => $profile->id, array('user' => $profile->id,
'created' => $dt->format(DateTime::W3C), 'created' => $created,
'crc32' => sprintf('%08x', $nb->url_crc32))); 'crc32' => $crc32));
} }
$nb->insert(); $nb->insert();

7
plugins/Bookmark/BookmarkPlugin.php
View File

@ -85,7 +85,7 @@ class BookmarkPlugin extends Plugin
false, false,
'UNI'), 'UNI'),
new ColumnDef('url_crc32', new ColumnDef('url_crc32',
'integer', 'integer unsigned',
null, null,
false, false,
'MUL'), 'MUL'),
@ -154,6 +154,7 @@ class BookmarkPlugin extends Plugin
switch ($cls) switch ($cls)
{ {
case 'ShowbookmarkAction':
case 'NewbookmarkAction': case 'NewbookmarkAction':
case 'BookmarkpopupAction': case 'BookmarkpopupAction':
include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php'; include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
@ -190,8 +191,8 @@ class BookmarkPlugin extends Plugin
$m->connect('bookmark/:user/:created/:crc32', $m->connect('bookmark/:user/:created/:crc32',
array('action' => 'showbookmark'), array('action' => 'showbookmark'),
array('user' => '[0-9]+', array('user' => '[0-9]+',
'created' => '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z', 'created' => '[0-9]{14}',
'crc32' => '[0-9A-F]{8}')); 'crc32' => '[0-9a-f]{8}'));
return true; return true;
} }