UUID is now createUUID
This commit is contained in:
parent
5639054699
commit
cb9be8a7ab
|
@ -4534,7 +4534,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
|
||||||
$owner_record = DBA::selectFirst('contact', [], ['uid' => api_user(), 'self' => true]);
|
$owner_record = DBA::selectFirst('contact', [], ['uid' => api_user(), 'self' => true]);
|
||||||
|
|
||||||
$arr = [];
|
$arr = [];
|
||||||
$arr['guid'] = System::UUID();
|
$arr['guid'] = System::createUUID();
|
||||||
$arr['uid'] = intval(api_user());
|
$arr['uid'] = intval(api_user());
|
||||||
$arr['uri'] = $uri;
|
$arr['uri'] = $uri;
|
||||||
$arr['parent-uri'] = $uri;
|
$arr['parent-uri'] = $uri;
|
||||||
|
|
|
@ -240,7 +240,7 @@ function item_post(App $a) {
|
||||||
$emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , '')));
|
$emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , '')));
|
||||||
$body = escape_tags(trim(defaults($_REQUEST, 'body' , '')));
|
$body = escape_tags(trim(defaults($_REQUEST, 'body' , '')));
|
||||||
$network = notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
|
$network = notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
|
||||||
$guid = System::UUID();
|
$guid = System::createUUID();
|
||||||
|
|
||||||
$postopts = defaults($_REQUEST, 'postopts', '');
|
$postopts = defaults($_REQUEST, 'postopts', '');
|
||||||
|
|
||||||
|
|
|
@ -472,7 +472,7 @@ function photos_post(App $a)
|
||||||
$uri = Item::newURI($page_owner_uid);
|
$uri = Item::newURI($page_owner_uid);
|
||||||
|
|
||||||
$arr = [];
|
$arr = [];
|
||||||
$arr['guid'] = System::UUID();
|
$arr['guid'] = System::createUUID();
|
||||||
$arr['uid'] = $page_owner_uid;
|
$arr['uid'] = $page_owner_uid;
|
||||||
$arr['uri'] = $uri;
|
$arr['uri'] = $uri;
|
||||||
$arr['parent-uri'] = $uri;
|
$arr['parent-uri'] = $uri;
|
||||||
|
@ -651,7 +651,7 @@ function photos_post(App $a)
|
||||||
$uri = Item::newURI($page_owner_uid);
|
$uri = Item::newURI($page_owner_uid);
|
||||||
|
|
||||||
$arr = [];
|
$arr = [];
|
||||||
$arr['guid'] = System::UUID();
|
$arr['guid'] = System::createUUID();
|
||||||
$arr['uid'] = $page_owner_uid;
|
$arr['uid'] = $page_owner_uid;
|
||||||
$arr['uri'] = $uri;
|
$arr['uri'] = $uri;
|
||||||
$arr['parent-uri'] = $uri;
|
$arr['parent-uri'] = $uri;
|
||||||
|
@ -889,7 +889,7 @@ function photos_post(App $a)
|
||||||
$arr['coord'] = $lat . ' ' . $lon;
|
$arr['coord'] = $lat . ' ' . $lon;
|
||||||
}
|
}
|
||||||
|
|
||||||
$arr['guid'] = System::UUID();
|
$arr['guid'] = System::createUUID();
|
||||||
$arr['uid'] = $page_owner_uid;
|
$arr['uid'] = $page_owner_uid;
|
||||||
$arr['uri'] = $uri;
|
$arr['uri'] = $uri;
|
||||||
$arr['parent-uri'] = $uri;
|
$arr['parent-uri'] = $uri;
|
||||||
|
|
|
@ -97,7 +97,7 @@ function poke_init(App $a)
|
||||||
|
|
||||||
$arr = [];
|
$arr = [];
|
||||||
|
|
||||||
$arr['guid'] = System::UUID();
|
$arr['guid'] = System::createUUID();
|
||||||
$arr['uid'] = $uid;
|
$arr['uid'] = $uid;
|
||||||
$arr['uri'] = $uri;
|
$arr['uri'] = $uri;
|
||||||
$arr['parent-uri'] = (!empty($parent_uri) ? $parent_uri : $uri);
|
$arr['parent-uri'] = (!empty($parent_uri) ? $parent_uri : $uri);
|
||||||
|
|
|
@ -108,7 +108,7 @@ EOT;
|
||||||
|
|
||||||
$arr = [];
|
$arr = [];
|
||||||
|
|
||||||
$arr['guid'] = System::UUID();
|
$arr['guid'] = System::createUUID();
|
||||||
$arr['uri'] = $uri;
|
$arr['uri'] = $uri;
|
||||||
$arr['uid'] = $owner_uid;
|
$arr['uid'] = $owner_uid;
|
||||||
$arr['contact-id'] = $contact['id'];
|
$arr['contact-id'] = $contact['id'];
|
||||||
|
|
|
@ -115,7 +115,7 @@ EOT;
|
||||||
|
|
||||||
$arr = [];
|
$arr = [];
|
||||||
|
|
||||||
$arr['guid'] = System::UUID();
|
$arr['guid'] = System::createUUID();
|
||||||
$arr['uri'] = $uri;
|
$arr['uri'] = $uri;
|
||||||
$arr['uid'] = $owner_uid;
|
$arr['uid'] = $owner_uid;
|
||||||
$arr['contact-id'] = $contact['id'];
|
$arr['contact-id'] = $contact['id'];
|
||||||
|
|
|
@ -167,7 +167,7 @@ class System extends BaseObject
|
||||||
* @param bool|string $prefix A given prefix (default is empty)
|
* @param bool|string $prefix A given prefix (default is empty)
|
||||||
* @return string a generated UUID
|
* @return string a generated UUID
|
||||||
*/
|
*/
|
||||||
public static function UUID($prefix = '')
|
public static function createUUID($prefix = '')
|
||||||
{
|
{
|
||||||
$guid = System::createGUID(32, $prefix);
|
$guid = System::createGUID(32, $prefix);
|
||||||
return substr($guid, 0, 8). '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
|
return substr($guid, 0, 8). '-' . substr($guid, 8, 4) . '-' . substr($guid, 12, 4) . '-' . substr($guid, 16, 4) . '-' . substr($guid, 20, 12);
|
||||||
|
|
|
@ -314,7 +314,7 @@ class Event extends BaseObject
|
||||||
|
|
||||||
Addon::callHooks('event_updated', $event['id']);
|
Addon::callHooks('event_updated', $event['id']);
|
||||||
} else {
|
} else {
|
||||||
$event['guid'] = defaults($arr, 'guid', System::UUID());
|
$event['guid'] = defaults($arr, 'guid', System::createUUID());
|
||||||
|
|
||||||
// New event. Store it.
|
// New event. Store it.
|
||||||
DBA::insert('event', $event);
|
DBA::insert('event', $event);
|
||||||
|
|
|
@ -1205,7 +1205,7 @@ class Item extends BaseObject
|
||||||
} elseif (!empty($item['uri'])) {
|
} elseif (!empty($item['uri'])) {
|
||||||
$guid = self::guidFromUri($item['uri'], $prefix_host);
|
$guid = self::guidFromUri($item['uri'], $prefix_host);
|
||||||
} else {
|
} else {
|
||||||
$guid = System::UUID(hash('crc32', $prefix_host));
|
$guid = System::createUUID(hash('crc32', $prefix_host));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $guid;
|
return $guid;
|
||||||
|
@ -2359,7 +2359,7 @@ class Item extends BaseObject
|
||||||
public static function newURI($uid, $guid = "")
|
public static function newURI($uid, $guid = "")
|
||||||
{
|
{
|
||||||
if ($guid == "") {
|
if ($guid == "") {
|
||||||
$guid = System::UUID();
|
$guid = System::createUUID();
|
||||||
}
|
}
|
||||||
|
|
||||||
return self::getApp()->get_baseurl() . '/object/' . $guid;
|
return self::getApp()->get_baseurl() . '/object/' . $guid;
|
||||||
|
@ -2686,7 +2686,7 @@ class Item extends BaseObject
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($contact['network'] != Protocol::FEED) {
|
if ($contact['network'] != Protocol::FEED) {
|
||||||
$datarray["guid"] = System::UUID();
|
$datarray["guid"] = System::createUUID();
|
||||||
unset($datarray["plink"]);
|
unset($datarray["plink"]);
|
||||||
$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
|
$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
|
||||||
$datarray["parent-uri"] = $datarray["uri"];
|
$datarray["parent-uri"] = $datarray["uri"];
|
||||||
|
@ -3115,7 +3115,7 @@ class Item extends BaseObject
|
||||||
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
|
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
|
||||||
|
|
||||||
$new_item = [
|
$new_item = [
|
||||||
'guid' => System::UUID(),
|
'guid' => System::createUUID(),
|
||||||
'uri' => self::newURI($item['uid']),
|
'uri' => self::newURI($item['uid']),
|
||||||
'uid' => $item['uid'],
|
'uid' => $item['uid'],
|
||||||
'contact-id' => $item_contact_id,
|
'contact-id' => $item_contact_id,
|
||||||
|
|
|
@ -46,7 +46,7 @@ class Mail
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
$guid = System::UUID();
|
$guid = System::createUUID();
|
||||||
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
|
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
|
||||||
|
|
||||||
$convid = 0;
|
$convid = 0;
|
||||||
|
@ -73,7 +73,7 @@ class Mail
|
||||||
$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
|
$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
|
||||||
$sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
|
$sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
|
||||||
|
|
||||||
$conv_guid = System::UUID();
|
$conv_guid = System::createUUID();
|
||||||
$convuri = $recip_handle . ':' . $conv_guid;
|
$convuri = $recip_handle . ':' . $conv_guid;
|
||||||
|
|
||||||
$handles = $recip_handle . ';' . $sender_handle;
|
$handles = $recip_handle . ';' . $sender_handle;
|
||||||
|
@ -171,7 +171,7 @@ class Mail
|
||||||
$subject = L10n::t('[no subject]');
|
$subject = L10n::t('[no subject]');
|
||||||
}
|
}
|
||||||
|
|
||||||
$guid = System::UUID();
|
$guid = System::createUUID();
|
||||||
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
|
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
|
||||||
|
|
||||||
$me = Probe::uri($replyto);
|
$me = Probe::uri($replyto);
|
||||||
|
@ -180,7 +180,7 @@ class Mail
|
||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
|
|
||||||
$conv_guid = System::UUID();
|
$conv_guid = System::createUUID();
|
||||||
|
|
||||||
$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
|
$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
|
||||||
|
|
||||||
|
|
|
@ -495,7 +495,7 @@ class User
|
||||||
$spubkey = $sres['pubkey'];
|
$spubkey = $sres['pubkey'];
|
||||||
|
|
||||||
$insert_result = DBA::insert('user', [
|
$insert_result = DBA::insert('user', [
|
||||||
'guid' => System::UUID(),
|
'guid' => System::createUUID(),
|
||||||
'username' => $username,
|
'username' => $username,
|
||||||
'password' => $new_password_encoded,
|
'password' => $new_password_encoded,
|
||||||
'email' => $email,
|
'email' => $email,
|
||||||
|
|
|
@ -3200,7 +3200,7 @@ class Diaspora
|
||||||
$author = self::myHandle($owner);
|
$author = self::myHandle($owner);
|
||||||
|
|
||||||
$message = ["author" => $author,
|
$message = ["author" => $author,
|
||||||
"guid" => System::UUID(),
|
"guid" => System::createUUID(),
|
||||||
"parent_type" => "Post",
|
"parent_type" => "Post",
|
||||||
"parent_guid" => $item["guid"]];
|
"parent_guid" => $item["guid"]];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user