a few minor changes

1 files changed, 72 insertions, 30 deletions

diff --git a/include/identity.php b/include/identity.php
index 1e450869a..9b8065f6f 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -3,11 +3,44 @@
 require_once('include/zot.php');
 require_once('include/crypto.php');
 
+
+function identity_check_service_class($account_id) {
+	$ret = array('success' => false, $message => '');
+	
+	$r = q("select count(entity_id) as total from entity were entity_account_id = %d ",
+		intval($account_id)
+	);
+	if(! ($r && count($r))) {
+		$ret['message'] = t('Unable to obtain identity information from database');
+		return $ret;
+	} 
+
+	if(! service_class_allows($account_id,'total_identities',$r[0]['total'])) {
+		$result['message'] .= upgrade_message();
+		return $result;
+	}
+
+	$ret['success'] = true;
+	return $ret;
+}
+
+
+// Required: name, nickname, account_id
+
+// optional: pageflags
+
 function create_identity($arr) {
 
-	$ret = array('success' => false, 'message' => '');
-	$nick = trim($_POST['nickname']);
-	$name = escape_tags($_POST['name']);
+	$ret = array('success' => false);
+
+	if(! $arr['account_id']) {
+		$ret['message'] = t('No account identifier');
+		return $ret;
+	}
+
+	$nick = trim($arr['nickname']);
+	$name = escape_tags($arr['name']);
+	$pageflags = ((x($arr,'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL);
 
 	if(check_webbie(array($nick)) !== $nick) {
 		$ret['message'] = t('Nickname has unsupported characters or is already being used on this site.');
@@ -24,7 +57,7 @@ function create_identity($arr) {
 		entity_pubkey, entity_pageflags )
 		values ( %d, %d, '%s', '%s', '%s', '%s', '%s', %d ) ",
 
-		intval(local_user()),
+		intval($arr['account_id']),
 		intval($primary),
 		dbesc($name),
 		dbesc($nick),
@@ -36,44 +69,53 @@ function create_identity($arr) {
 			
 	$r = q("select * from entity where entity_account_id = %d 
 		and entity_global_id = '%s' limit 1",
-		intval(local_user()),
+		intval($arr['account_id']),
 		dbesc($guid)
 	);
+
 	if(! ($r && count($r))) {
 		$ret['message'] = t('Unable to retrieve created identity');
 		return $ret;
 	}
+	
 	$ret['entity'] = $r[0];
+
+	set_default_login_identity($arr['account_id'],$ret['entity']['entity_id'],false);
+	
+	// Create a verified hub location pointing to this site.
+
+	$r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_flags, 
+		hubloc_url, hubloc_url_sig, hubloc_callback, hubloc_sitekey )
+		values ( '%s', '%s', %d, '%s', '%s', '%s', '%s' )",
+		dbesc($ret['entity']['entity_global_id']),
+		dbesc(base64url_encode(rsa_sign($ret['entity']['entity_global_id'],$ret['entity']['entity_prvkey']))),
+		intval(($primary) ? HUBLOC_FLAGS_PRIMARY : 0),
+		dbesc(z_root()),
+		dbesc(base64url_encode(rsa_sign(z_root(),$ret['entity']['entity_prvkey']))),
+		dbesc(z_root() . '/post'),
+		dbesc(get_config('system','pubkey'))
+	);
+	if(! $r)
+		logger('create_identity: Unable to store hub location');
+ 
+
 	$ret['success'] = true;
 	return $ret;
 
 }
 
+// set default identity for account_id to identity_id
+// if $force is false only do this if there is no current default
 
-
-
-
-
-class simple_identity {
-
-	private $identity_uid;
-	private $identity_name;
-	private $identity_url;
-	private $identity_photo;
-
-	function __construct($uid = '',$name = '',$url = '',$photo = '') {
-		$this->identity_uid    = $uid;
-		$this->identity_name   = $name;
-		$this->identity_url    = $url;
-		$this->identity_photo  = $photo;
-	}
-
-	function to_array() {
-		return array(
-			'zuid'  => $this->identity_uid,
-			'name'  => $this->identity_name,
-			'url'   => $this->identity_url,
-			'photo' => $this->identity_photo
+function set_default_login_identity($account_id,$entity_id,$force = true) {
+	$r = q("select account_default_entity from account where account_id = %d limit 1",
+		intval($account_id)
+	);
+	if(($r) && (count($r)) && ((! intval($r[0]['account_default_entity'])) || $force)) {
+		$r = q("update account set account_default_entity = %d where account_id = %d limit 1",
+			intval($entity_id),
+			intval($account_id)
 		);
 	}
-}
\ No newline at end of file
+}
+