X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=05284dce4335314e21946b87a432ff2e85b04046;hb=94302a7924b8fd7dfc418b64df83ca71749838b5;hp=c136dc57441b5bcfaca0eebb005adb5b666241bc;hpb=7e9ae2451176aaa85a4bbb2f36374fa00afc49ea;p=friendica.git

diff --git a/boot.php b/boot.php
index c136dc5744..05284dce43 100644
--- a/boot.php
+++ b/boot.php
@@ -16,9 +16,9 @@ require_once('include/dbstructure.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Ginger');
-define ( 'FRIENDICA_VERSION',      '3.3.3-RC' );
+define ( 'FRIENDICA_VERSION',      '3.3.3' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1179      );
+define ( 'DB_UPDATE_VERSION',      1181      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -1196,35 +1196,24 @@ if(! function_exists('check_plugins')) {
 	}
 }
 
-function get_guid($size=16) {
-	$exists = true; // assume by default that we don't have a unique guid
-	do {
-		$prefix = "";
-		while (strlen($prefix) < ($size - 13))
-			$prefix .= mt_rand();
+function get_guid($size=16, $prefix = "") {
 
-		$s = substr(uniqid($prefix), -$size);
-
-		$r = q("select id from guid where guid = '%s' limit 1", dbesc($s));
-		if(! count($r))
-			$exists = false;
-	} while($exists);
-	q("insert into guid (guid) values ('%s') ", dbesc($s));
-	return $s;
-}
+	if ($prefix == "") {
+		$a = get_app();
+		$prefix = hash("crc32", $a->get_hostname());
+	}
 
-/*function get_guid($size=16) {
-	$exists = true; // assume by default that we don't have a unique guid
-	do {
-		$s = random_string($size);
-		$r = q("select id from guid where guid = '%s' limit 1", dbesc($s));
-		if(! count($r))
-			$exists = false;
-	} while($exists);
-	q("insert into guid ( guid ) values ( '%s' ) ", dbesc($s));
-	return $s;
-}*/
+	while (strlen($prefix) < ($size - 13))
+		$prefix .= mt_rand();
 
+	if ($size >= 24) {
+		$prefix = substr($prefix, 0, $size - 22);
+		return(str_replace(".", "", uniqid($prefix, true)));
+	} else {
+		$prefix = substr($prefix, 0, $size - 13);
+		return(uniqid($prefix));
+	}
+}
 
 // wrapper for adding a login box. If $register == true provide a registration
 // link. This will most always depend on the value of $a->config['register_policy'].
@@ -1678,8 +1667,24 @@ if(! function_exists('profile_sidebar')) {
 
 		if (!$block){
 			$contact_block = contact_block();
-		}
 
+			if(is_array($a->profile) AND !$a->profile['hide-friends']) {
+				$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
+					intval($a->profile['uid']));
+				if(count($r))
+					$updated =  date("c", strtotime($r[0]['updated']));
+
+				$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+						AND `network` IN ('%s', '%s', '%s', '')",
+					intval($profile['uid']),
+					dbesc(NETWORK_DFRN),
+					dbesc(NETWORK_DIASPORA),
+					dbesc(NETWORK_OSTATUS)
+				);
+				if(count($r))
+					$contacts = intval($r[0]['total']);
+			}
+		}
 
 		$p = array();
 		foreach($profile as $k => $v) {
@@ -1704,6 +1709,8 @@ if(! function_exists('profile_sidebar')) {
 			'$homepage' => $homepage,
 			'$about' => $about,
 			'$network' =>  t('Network:'),
+			'$contacts' => $contacts,
+			'$updated' => $updated,
 			'$diaspora' => $diaspora,
 			'$contact_block' => $contact_block,
 		));