Browse Source

UUID is now createUUID

pull/5794/head
Michael 3 years ago
parent
commit
cb9be8a7ab
12 changed files with 20 additions and 20 deletions
  1. +1
    -1
      include/api.php
  2. +1
    -1
      mod/item.php
  3. +3
    -3
      mod/photos.php
  4. +1
    -1
      mod/poke.php
  5. +1
    -1
      mod/subthread.php
  6. +1
    -1
      mod/tagger.php
  7. +1
    -1
      src/Core/System.php
  8. +1
    -1
      src/Model/Event.php
  9. +4
    -4
      src/Model/Item.php
  10. +4
    -4
      src/Model/Mail.php
  11. +1
    -1
      src/Model/User.php
  12. +1
    -1
      src/Protocol/Diaspora.php

+ 1
- 1
include/api.php View File

@ -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]);
$arr = [];
$arr['guid'] = System::UUID();
$arr['guid'] = System::createUUID();
$arr['uid'] = intval(api_user());
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;


+ 1
- 1
mod/item.php View File

@ -240,7 +240,7 @@ function item_post(App $a) {
$emailcc = notags(trim(defaults($_REQUEST, 'emailcc' , '')));
$body = escape_tags(trim(defaults($_REQUEST, 'body' , '')));
$network = notags(trim(defaults($_REQUEST, 'network' , Protocol::DFRN)));
$guid = System::UUID();
$guid = System::createUUID();
$postopts = defaults($_REQUEST, 'postopts', '');


+ 3
- 3
mod/photos.php View File

@ -472,7 +472,7 @@ function photos_post(App $a)
$uri = Item::newURI($page_owner_uid);
$arr = [];
$arr['guid'] = System::UUID();
$arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
@ -651,7 +651,7 @@ function photos_post(App $a)
$uri = Item::newURI($page_owner_uid);
$arr = [];
$arr['guid'] = System::UUID();
$arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
@ -889,7 +889,7 @@ function photos_post(App $a)
$arr['coord'] = $lat . ' ' . $lon;
}
$arr['guid'] = System::UUID();
$arr['guid'] = System::createUUID();
$arr['uid'] = $page_owner_uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;


+ 1
- 1
mod/poke.php View File

@ -97,7 +97,7 @@ function poke_init(App $a)
$arr = [];
$arr['guid'] = System::UUID();
$arr['guid'] = System::createUUID();
$arr['uid'] = $uid;
$arr['uri'] = $uri;
$arr['parent-uri'] = (!empty($parent_uri) ? $parent_uri : $uri);


+ 1
- 1
mod/subthread.php View File

@ -108,7 +108,7 @@ EOT;
$arr = [];
$arr['guid'] = System::UUID();
$arr['guid'] = System::createUUID();
$arr['uri'] = $uri;
$arr['uid'] = $owner_uid;
$arr['contact-id'] = $contact['id'];


+ 1
- 1
mod/tagger.php View File

@ -115,7 +115,7 @@ EOT;
$arr = [];
$arr['guid'] = System::UUID();
$arr['guid'] = System::createUUID();
$arr['uri'] = $uri;
$arr['uid'] = $owner_uid;
$arr['contact-id'] = $contact['id'];


+ 1
- 1
src/Core/System.php View File

@ -167,7 +167,7 @@ class System extends BaseObject
* @param bool|string $prefix A given prefix (default is empty)
* @return string a generated UUID
*/
public static function UUID($prefix = '')
public static function createUUID($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);


+ 1
- 1
src/Model/Event.php View File

@ -314,7 +314,7 @@ class Event extends BaseObject
Addon::callHooks('event_updated', $event['id']);
} else {
$event['guid'] = defaults($arr, 'guid', System::UUID());
$event['guid'] = defaults($arr, 'guid', System::createUUID());
// New event. Store it.
DBA::insert('event', $event);


+ 4
- 4
src/Model/Item.php View File

@ -1205,7 +1205,7 @@ class Item extends BaseObject
} elseif (!empty($item['uri'])) {
$guid = self::guidFromUri($item['uri'], $prefix_host);
} else {
$guid = System::UUID(hash('crc32', $prefix_host));
$guid = System::createUUID(hash('crc32', $prefix_host));
}
return $guid;
@ -2359,7 +2359,7 @@ class Item extends BaseObject
public static function newURI($uid, $guid = "")
{
if ($guid == "") {
$guid = System::UUID();
$guid = System::createUUID();
}
return self::getApp()->get_baseurl() . '/object/' . $guid;
@ -2686,7 +2686,7 @@ class Item extends BaseObject
}
if ($contact['network'] != Protocol::FEED) {
$datarray["guid"] = System::UUID();
$datarray["guid"] = System::createUUID();
unset($datarray["plink"]);
$datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]);
$datarray["parent-uri"] = $datarray["uri"];
@ -3115,7 +3115,7 @@ class Item extends BaseObject
$objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
$new_item = [
'guid' => System::UUID(),
'guid' => System::createUUID(),
'uri' => self::newURI($item['uid']),
'uid' => $item['uid'],
'contact-id' => $item_contact_id,


+ 4
- 4
src/Model/Mail.php View File

@ -46,7 +46,7 @@ class Mail
return -2;
}
$guid = System::UUID();
$guid = System::createUUID();
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
$convid = 0;
@ -73,7 +73,7 @@ class Mail
$recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host);
$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;
$handles = $recip_handle . ';' . $sender_handle;
@ -171,7 +171,7 @@ class Mail
$subject = L10n::t('[no subject]');
}
$guid = System::UUID();
$guid = System::createUUID();
$uri = 'urn:X-dfrn:' . System::baseUrl() . ':' . local_user() . ':' . $guid;
$me = Probe::uri($replyto);
@ -180,7 +180,7 @@ class Mail
return -2;
}
$conv_guid = System::UUID();
$conv_guid = System::createUUID();
$recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);


+ 1
- 1
src/Model/User.php View File

@ -495,7 +495,7 @@ class User
$spubkey = $sres['pubkey'];
$insert_result = DBA::insert('user', [
'guid' => System::UUID(),
'guid' => System::createUUID(),
'username' => $username,
'password' => $new_password_encoded,
'email' => $email,


+ 1
- 1
src/Protocol/Diaspora.php View File

@ -3200,7 +3200,7 @@ class Diaspora
$author = self::myHandle($owner);
$message = ["author" => $author,
"guid" => System::UUID(),
"guid" => System::createUUID(),
"parent_type" => "Post",
"parent_guid" => $item["guid"]];


Loading…
Cancel
Save