UUID support

public_html/classes/node.php

@@ -22,12 +22,12 @@ class Node extends CPHPDatabaseRecordClass
 	public $prototype = array(
 		'string' => array(
 			"Name"			=> "Name",
-			"Notes"			=> "Notes"
+			"Notes"			=> "Notes",
-		),
-		'numeric' => array(
 			"TypeId"		=> "TypeId",
 			"ParentRevisionId"	=> "ParentRevisionId",
-			"FirstRevisionId"	=> "FirstRevisionId",
+			"FirstRevisionId"	=> "FirstRevisionId"
+		),
+		'numeric' => array(
 			"UserId"		=> "UserId"
 		),
 		'timestamp' => array(

public_html/classes/property.php

@@ -23,15 +23,15 @@ class Property extends CPHPDatabaseRecordClass
 		'string' => array(
 			"Name"			=> "Name",
 			"Value"			=> "Value",
-			"Source"		=> "Source"
+			"Source"		=> "Source",
-		),
-		'numeric' => array(
 			"TypeId"		=> "TypeId",
 			"ParentRevisionId"	=> "ParentRevisionId",
 			"FirstRevisionId"	=> "FirstRevisionId",
-			"UserId"		=> "UserId",
 			"NodeId"		=> "NodeId",
-			"RelationshipId"	=> "RelationshipId",
+			"RelationshipId"	=> "RelationshipId"
+		),
+		'numeric' => array(
+			"UserId"		=> "UserId",
 			"Reliability"		=> "Reliability"
 		),
 		'timestamp' => array(

public_html/classes/relationship.php

@@ -23,15 +23,15 @@ class Relationship extends CPHPDatabaseRecordClass
 		'string' => array(
 			"Name"			=> "Name",
 			"Source"		=> "Source",
-			"Notes"			=> "Notes"
+			"Notes"			=> "Notes",
-		),
-		'numeric' => array(
 			"TypeId"		=> "TypeId",
 			"ParentRevisionId"	=> "ParentRevisionId",
 			"FirstRevisionId"	=> "FirstRevisionId",
-			"UserId"		=> "UserId",
 			"FromNodeId"		=> "FromNodeId",
-			"ToNodeId"		=> "ToNodeId",
+			"ToNodeId"		=> "ToNodeId"
+		),
+		'numeric' => array(
+			"UserId"		=> "UserId",
 			"Reliability"		=> "Reliability"
 		),
 		'timestamp' => array(

public_html/includes/base.php

@@ -16,3 +16,10 @@ if(!isset($_APP)) { die("Unauthorized."); }
 $_CPHP = true;
 $_CPHP_CONFIG = "../config.json";
 require("cphp/base.php");
+
+require("uuid.php");
+
+function generate_uuid()
+{
+	return UUID::v4();
+}

public_html/includes/uuid.php

@@ -0,0 +1,111 @@
+<?php
+
+/* Source: http://www.php.net/manual/en/function.uniqid.php#94959
+ * License unspecified. */
+
+class UUID {
+	public static function v3($namespace, $name) {
+		if(!self::is_valid($namespace)) return false;
+
+		// Get hexadecimal components of namespace
+		$nhex = str_replace(array('-','{','}'), '', $namespace);
+
+		// Binary Value
+		$nstr = '';
+
+		// Convert Namespace UUID to bits
+		for($i = 0; $i < strlen($nhex); $i+=2) {
+			$nstr .= chr(hexdec($nhex[$i].$nhex[$i+1]));
+		}
+
+		// Calculate hash value
+		$hash = md5($nstr . $name);
+
+		return sprintf('%08s-%04s-%04x-%04x-%12s',
+
+			// 32 bits for "time_low"
+			substr($hash, 0, 8),
+
+			// 16 bits for "time_mid"
+			substr($hash, 8, 4),
+
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 3
+			(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x3000,
+
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
+
+			// 48 bits for "node"
+			substr($hash, 20, 12)
+		);
+	}
+
+	public static function v4() {
+		return sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+
+			// 32 bits for "time_low"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+
+			// 16 bits for "time_mid"
+			mt_rand(0, 0xffff),
+
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 4
+			mt_rand(0, 0x0fff) | 0x4000,
+
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			mt_rand(0, 0x3fff) | 0x8000,
+
+			// 48 bits for "node"
+			mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+		);
+	}
+
+	public static function v5($namespace, $name) {
+		if(!self::is_valid($namespace)) return false;
+
+		// Get hexadecimal components of namespace
+		$nhex = str_replace(array('-','{','}'), '', $namespace);
+
+		// Binary Value
+		$nstr = '';
+
+		// Convert Namespace UUID to bits
+		for($i = 0; $i < strlen($nhex); $i+=2) {
+			$nstr .= chr(hexdec($nhex[$i].$nhex[$i+1]));
+		}
+
+		// Calculate hash value
+		$hash = sha1($nstr . $name);
+
+		return sprintf('%08s-%04s-%04x-%04x-%12s',
+
+			// 32 bits for "time_low"
+			substr($hash, 0, 8),
+
+			// 16 bits for "time_mid"
+			substr($hash, 8, 4),
+
+			// 16 bits for "time_hi_and_version",
+			// four most significant bits holds version number 5
+			(hexdec(substr($hash, 12, 4)) & 0x0fff) | 0x5000,
+
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			(hexdec(substr($hash, 16, 4)) & 0x3fff) | 0x8000,
+
+			// 48 bits for "node"
+			substr($hash, 20, 12)
+		);
+	}
+
+	public static function is_valid($uuid) {
+		return preg_match('/^\{?[0-9a-f]{8}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?[0-9a-f]{4}\-?[0-9a-f]{12}\}?$/i', $uuid) === 1;
+	}
+}

public_html/modules/nodes/create.php

@@ -32,28 +32,54 @@ elseif($router->uMethod == "post")
 	
 	if(empty($sErrors))
 	{
+		$uNodeId = generate_uuid();
+		
 		$sNode = new Node();
 		
+		$sNode->uId = $uNodeId;
 		$sNode->uName = $_POST['name'];
 		$sNode->uNotes = $_POST['notes'];
 		
-		$sNode->uTypeId = 0;
+		$sNode->uTypeId = "";
-		$sNode->uParentRevisionId = 0;
+		$sNode->uParentRevisionId = "";
-		$sNode->uFirstRevisionId = 0;
+		$sNode->uFirstRevisionId = $uNodeId;
 		$sNode->uUserId = 0;
 		$sNode->uCreationDate = time();
 		$sNode->uLatestRevision = true;
 		
 		$sNode->InsertIntoDatabase();
 		
-		/* Update the entry to refer to itself as the first revision */
+		/* Insert properties, if any */
-		$sNode->uFirstRevisionId = $sNode->sId;
+		foreach(array_combine($_POST['property_name'], $_POST['property_value']) as $property_name => $property_value)
-		$sNode->InsertIntoDatabase();
+		{
+			if(!empty($property_name))
+			{
+				$uPropertyId = generate_uuid();
+				
+				$sProperty = new Property();
+				
+				$sProperty->uId = $uPropertyId;
+				$sProperty->uName = $property_name;
+				$sProperty->uValue = $property_value;
+				$sProperty->uSource = "";
+				
+				$sProperty->uTypeId = "";
+				$sProperty->uParentRevisionId = "";
+				$sProperty->uFirstRevisionId = $uPropertyId;
+				$sProperty->uNodeId = $uNodeId;
+				$sProperty->uRelationshipId = "";
+				$sProperty->uReliability = 1; /* Normal */
+				$sProperty->uCreationDate = time();
+				$sProperty->uLatestRevision = true;
+				
+				$sProperty->InsertIntoDatabase();
+			}
+		}
 		
 		$sData = array(
 			"result"	=> "success",
 			"message"	=> "Node '" . htmlspecialchars($_POST['name']) . "' created.",
-			"node_id"	=> $sNode->sId
+			"node_id"	=> $uNodeId
 		);
 	}
 	else

public_html/rewrite.php

@@ -42,7 +42,8 @@ if(!empty($router->uVariables['json']))
 {
 	echo(json_encode($sData));
 }
-
+/*
 $sNode = new Node(1);
 $sNode->uName = random_string(15);
 $sNode->InsertIntoDatabase();
+*/