Committing new Profile webroot parts

* This makes the Classifieds, Picks and Notes work in basic mode
- Meaning that this won't crash anything

git-svn-id: http://forge.opensimulator.org/svn/osprofile/trunk@38 19860011-0018-435d-96ae-4a7b0aaa3128

webroot/databaseinfo.php

@@ -1,6 +1,6 @@
-<?
-$DB_HOST = "localhost";
-$DB_USER = "root";
-$DB_PASSWORD = "";
-$DB_NAME = "osprofile";
-?>
+<?
+$DB_HOST = "localhost";
+$DB_USER = "root";
+$DB_PASSWORD = "";
+$DB_NAME = "osmodules";
+?>

webroot/profile.php

@@ -59,6 +59,103 @@ function avatarclassifiedsrequest($method_name, $params, $app_data)
 
 # Classifieds Update
 
+xmlrpc_server_register_method($xmlrpc_server, "classified_update",
+		"classified_update");
+
+function classified_update($method_name, $params, $app_data)
+{
+	$req 			= $params[0];
+
+	$classifieduuid = $req['classifiedUUID'];
+	$creator		= $req['creatorUUID'];
+	$category		= $req['category'];
+	$name			= $req['name'];
+	$description	= $req['description'];
+	$parceluuid		= $req['parcelUUID'];
+	$parentestate	= $req['parentestate'];
+	$snapshotuuid	= $req['snapshotUUID'];
+	$simname		= $req['sim_name'];
+	$globalpos		= $req['globalpos'];
+	$parcelname		= $req['parcelname'];
+	$classifiedflag = $req['classifiedFlags'];
+	$priceforlist	= $req['classifiedPrice'];
+	
+	// Check if we already have this one in the database
+	$check = mysql_query("select count(*) from classifieds WHERE ".
+			"classifieduuid = '". mysql_escape_string($classifieduuid) ."'");
+
+	while ($row = mysql_fetch_row($check))
+	{
+		$ready = $row[0];
+	}
+
+	if ($ready == 0)
+	{
+		// Doing some late checking
+		// Should be done by the module but let's see what happens when
+		// I do it here
+
+		if($parcelname == "")
+		{
+			$parcelname = "Unknown";
+		}
+		
+		if($parceluuid == "")
+		{
+			$parceluuid = "00000000-0000-0000-0000-0000000000000";
+		}
+
+		if($description == "")
+		{
+			$description = "No Description";
+		}
+
+		if($classifiedflag == 2)
+		{
+			$creationdate = time();
+			$expirationdate = time() + (7 * 24 * 60 * 60);
+		}
+		else
+		{
+			$creationdate = time();
+			$expirationdate = time() + (365 * 24 * 60 * 60);
+		}
+	
+		$insertquery = "insert into classifieds VALUES ".
+			"('". mysql_escape_string($classifieduuid) ."',".
+			"'". mysql_escape_string($creator) ."',".
+			"". mysql_escape_string($creationdate) .",".
+			"". mysql_escape_string($expirationdate) .",".
+			"'". mysql_escape_string($category) ."',".
+			"'". mysql_escape_string($name) ."',".
+			"'". mysql_escape_string($description) ."',".
+			"'". mysql_escape_string($parceluuid) ."',".
+			"". mysql_escape_string($parentestate) .",".
+			"'". mysql_escape_string($snapshotuuid) ."',".
+			"'". mysql_escape_string($simname) ."',".
+			"'". mysql_escape_string($globalpos) ."',".
+			"'". mysql_escape_string($parcelname) ."',".
+			"". mysql_escape_string($classifiedflag) .",".
+			"". mysql_escape_string($priceforlist) .")";
+		
+		print $insertquery;
+
+		// Create a new record for this avatar note		
+		$result = mysql_query($insertquery);
+	}
+	else
+	{
+
+	}
+	
+	$response_xml = xmlrpc_encode(array(
+		'success'	  => True,
+		'errorMessage' => "",
+		'data' => $data
+	));
+
+	print $response_xml;
+}
 
 # Classifieds Delete
 
@@ -101,8 +198,6 @@ function avatarpicksrequest($method_name, $params, $app_data)
 	$result = mysql_query("select * from userpicks where ".
 			"creatoruuid = '". mysql_escape_string($uuid) ."'");
 
-    $data = array();
-
 	while (($row = mysql_fetch_assoc($result)))
 	{
 		$data[] = array(
@@ -135,15 +230,20 @@ function pickinforequest($method_name, $params, $app_data)
 			"creatoruuid = '". mysql_escape_string($uuid) ."' AND ".
 			"pickuuid = '". mysql_escape_string($pick) ."'");
 
-	if (($row = mysql_fetch_assoc($result)))
+	while (($row = mysql_fetch_assoc($result)))
 	{
+		if ($row["description"] == "")
+		{
+			$row["description"] = "No description given";
+		}
+		
 		$data[] = array(
 				"pickuuid" => $row["pickuuid"],
 				"creatoruuid" => $row["creatoruuid"],
 				"toppick" => $row["toppick"],
 				"parceluuid" => $row["parceluuid"],
 				"name" => $row["name"],
-				"description" => $row["desc"],
+				"description" => $row["description"],
 				"snapshotuuid" => $row["snapshotuuid"],
 				"user" => $row["user"],
 				"originalname" => $row["originalname"],
@@ -151,20 +251,13 @@ function pickinforequest($method_name, $params, $app_data)
 				"posglobal" => $row["posglobal"],
 				"sortorder"=> $row["sortorder"],
 				"enabled" => $row["enabled"]);
-        $response_xml = xmlrpc_encode(array(
-            'success'	  => True,
-            'errorMessage' => "",
-            'data' => $data
-        ));
 	}
-    else
-    {
-        $response_xml = xmlrpc_encode(array(
-            'success'	  => True,
-            'errorMessage' => ""
-        ));
-    }
 
+	$response_xml = xmlrpc_encode(array(
+		'success'	  => True,
+		'errorMessage' => "",
+		'data' => $data
+	));
 
 	print $response_xml;
 }
@@ -185,10 +278,8 @@ function picks_update($method_name, $params, $app_data)
 	$description	= $req['desc'];
 	$parceluuid		= $req['parcel_uuid'];
 	$snapshotuuid	= $req['snapshot_id']; 
-#	$user			= $req['user'];
-#	$original		= $req['original'];
-    $user = "";
-    $original = $name;
+	$user			= $req['user'];
+	$original		= $req['original'];
 	$simname		= $req['sim_name'];
 	$posglobal		= $req['pos_global'];
 	$sortorder		= $req['sort_order'];
@@ -216,7 +307,7 @@ function picks_update($method_name, $params, $app_data)
 
 		if($description == "")
 		{
-			$description = "";
+			$description = "No Description";
 		}
 
 		if($user == "")
@@ -244,6 +335,8 @@ function picks_update($method_name, $params, $app_data)
 			"'". mysql_escape_string($sortorder) ."',".
 			"'". mysql_escape_string($enabled) ."')";
 		
+		//print $insertquery;
+
 		// Create a new record for this avatar note		
 		$result = mysql_query($insertquery);
 	}
@@ -255,7 +348,12 @@ function picks_update($method_name, $params, $app_data)
 
 		if($parceluuid == "")
 		{
-			$parceluuid = "00000000-0000-0000-0000-0000000000000";
+			$parceluuid = "00000000-0000-0000-0000-00000000000";
+		}
+
+		if($description == "")
+		{
+			$description = "Test";
 		}
 
 		if($user == "")
@@ -268,21 +366,38 @@ function picks_update($method_name, $params, $app_data)
 			$original = "Unknown";
 		}
 
-		$updatequery = "update userpicks SET ".
-			"name = '". mysql_escape_string($name) ."' , ".
-			"`desc` = '". mysql_escape_string($description) ."' , ".
-			"snapshotuuid = '". mysql_escape_string($snapshotuuid) ."' , ".
-			"simname = '". mysql_escape_string($simname) ."' , ".
-			"posglobal = '". mysql_escape_string($posglobal) ."' WHERE ".
+		$updatequery1 = "update userpicks SET ".
+			"parceluuid = '". mysql_escape_string($parceluuid) ."' WHERE ".
 			"pickuuid = '". mysql_escape_string($pickuuid) ."'";
 
+		$updatequery2 = "update userpicks SET ".
+			"name = '". mysql_escape_string($name) ."' WHERE ".
+			"pickuuid = '". mysql_escape_string($pickuuid) ."'";
+
+		$updatequery3 = "update userpicks SET ".
+			"description = '". mysql_escape_string($description) ."' WHERE ".
+			"pickuuid = '". mysql_escape_string($pickuuid) ."'";
+
+		$updatequery4 = "update userpicks SET ".
+			"snapshotuuid = '". mysql_escape_string($snapshotuuid) ."' WHERE ".
+			"pickuuid = '". mysql_escape_string($pickuuid) ."'";
+		
+		//print $updatequery1."\r\n";
+		//print $updatequery2."\r\n";
+		//print $updatequery3."\r\n";
+		//print $updatequery4."\r\n";
+
 		// Update the existing record
-		$result = mysql_query($updatequery);
+		$resultQ1 = mysql_query($updatequery1);
+		$resultQ2 = mysql_query($updatequery2);
+		$resultQ3 = mysql_query($updatequery3);
+		$resultQ4 = mysql_query($updatequery4);
 	}
 
 	$response_xml = xmlrpc_encode(array(
 		'success'	  => True,
-		'errorMessage' => ""
+		'errorMessage' => "",
+		'data' => $data
 	));
 
 	print $response_xml;
@@ -304,7 +419,8 @@ function picks_delete($method_name, $params, $app_data)
 	
 	$response_xml = xmlrpc_encode(array(
 		'success'	  => True,
-		'errorMessage' => ""
+		'errorMessage' => "",
+		'data' => $data
 	));
 
 	print $response_xml;
@@ -331,22 +447,12 @@ function avatarnotesrequest($method_name, $params, $app_data)
 			"useruuid = '". mysql_escape_string($uuid) ."' AND ".
 			"targetuuid = '". mysql_escape_string($targetuuid) ."'");
 
-	if (($row = mysql_fetch_assoc($result)))
+	while (($row = mysql_fetch_assoc($result)))
 	{
 		$data[] = array(
 				"targetid" => $row["targetuuid"],
 				"notes" => $row["notes"]);
 	}
-    else
-    {
-        $response_xml = xmlrpc_encode(array(
-            'success'	  => True,
-            'errorMessage' => ""
-        ));
-
-        print $response_xml;
-        return;
-    }
 
 	$response_xml = xmlrpc_encode(array(
 		'success'	  => True,
@@ -407,7 +513,8 @@ function avatar_notes_update($method_name, $params, $app_data)
 
 	$response_xml = xmlrpc_encode(array(
 		'success'	  => True,
-		'errorMessage' => ""
+		'errorMessage' => "",
+		'data' => $data
 	));
 
 	print $response_xml;

webroot/sql/osmodules.sql

@@ -0,0 +1,144 @@
+CREATE TABLE `allparcels` (
+  `regionUUID` varchar(255) NOT NULL,
+  `parcelname` varchar(255) NOT NULL,
+  `ownerUUID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `groupUUID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `landingpoint` varchar(255) NOT NULL,
+  `parcelUUID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `infoUUID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `parcelarea` int(11) NOT NULL,
+  PRIMARY KEY  (`parcelUUID`),
+  KEY `regionUUID` (`regionUUID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `classifieds` (
+  `classifieduuid` char(36) NOT NULL,
+  `creatoruuid` char(36) NOT NULL,
+  `creationdate` int(20) NOT NULL,
+  `expirationdate` int(20) NOT NULL,
+  `category` varchar(20) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `description` text NOT NULL,
+  `parceluuid` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `parentestate` int(11) NOT NULL,
+  `snapshotuuid` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `simname` varchar(255) NOT NULL,
+  `posglobal` varchar(255) NOT NULL,
+  `parcelname` varchar(255) NOT NULL,
+  `classifiedflags` int(8) NOT NULL,
+  `priceforlisting` int(5) NOT NULL,
+  PRIMARY KEY  (`classifieduuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `events` (
+  `owneruuid` char(40) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `eventid` int(11) NOT NULL auto_increment,
+  `creatoruuid` char(40) NOT NULL,
+  `category` int(2) NOT NULL,
+  `description` text NOT NULL,
+  `dateUTC` int(12) NOT NULL,
+  `duration` int(3) NOT NULL,
+  `covercharge` int(1) NOT NULL,
+  `coveramount` int(10) NOT NULL,
+  `simname` varchar(255) NOT NULL,
+  `globalPos` varchar(255) NOT NULL,
+  `eventflags` int(10) NOT NULL,
+  `mature` enum('true','false') NOT NULL,
+  PRIMARY KEY  (`eventid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+
+CREATE TABLE `hostsregister` (
+  `host` varchar(255) NOT NULL,
+  `port` int(5) NOT NULL,
+  `register` int(10) NOT NULL,
+  `lastcheck` int(10) NOT NULL,
+  `failcounter` int(1) NOT NULL,
+  PRIMARY KEY  (`host`,`port`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `objects` (
+  `objectuuid` varchar(255) NOT NULL,
+  `parceluuid` varchar(255) NOT NULL,
+  `location` varchar(255) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `regionuuid` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`objectuuid`,`parceluuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `parcels` (
+  `regionUUID` varchar(255) NOT NULL,
+  `parcelname` varchar(255) NOT NULL,
+  `parcelUUID` varchar(255) NOT NULL,
+  `landingpoint` varchar(255) NOT NULL,
+  `description` varchar(255) NOT NULL,
+  `searchcategory` varchar(50) NOT NULL,
+  `build` enum('true','false') NOT NULL,
+  `script` enum('true','false') NOT NULL,
+  `public` enum('true','false') NOT NULL,
+  `dwell` float NOT NULL default '0',
+  `infouuid` varchar(255) NOT NULL default '',
+  PRIMARY KEY  (`regionUUID`,`parcelUUID`),
+  KEY `name` (`parcelname`),
+  KEY `description` (`description`),
+  KEY `searchcategory` (`searchcategory`),
+  KEY `dwell` (`dwell`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `parcelsales` (
+  `regionUUID` varchar(255) NOT NULL,
+  `parcelname` varchar(255) NOT NULL,
+  `parcelUUID` varchar(255) NOT NULL,
+  `area` int(6) NOT NULL,
+  `saleprice` int(11) NOT NULL,
+  `landingpoint` varchar(255) NOT NULL,
+  `infoUUID` char(36) NOT NULL default '00000000-0000-0000-0000-000000000000',
+  `dwell` int(11) NOT NULL,
+  `parentestate` int(11) NOT NULL default '1',
+  `mature` varchar(32) NOT NULL default 'false',
+  PRIMARY KEY  (`regionUUID`,`parcelUUID`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `popularplaces` (
+  `parcelUUID` char(36) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `dwell` float NOT NULL,
+  `infoUUID` char(36) NOT NULL,
+  `has_picture` tinyint(4) NOT NULL,
+  `mature` tinyint(4) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `regions` (
+  `regionname` varchar(255) NOT NULL,
+  `regionuuid` varchar(255) NOT NULL,
+  `regionhandle` varchar(255) NOT NULL,
+  `url` varchar(255) NOT NULL,
+  `owner` varchar(255) NOT NULL,
+  `owneruuid` varchar(255) NOT NULL,
+  PRIMARY KEY  (`regionuuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `usernotes` (
+  `useruuid` varchar(36) NOT NULL,
+  `targetuuid` varchar(36) NOT NULL,
+  `notes` text NOT NULL,
+  PRIMARY KEY  (`useruuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE `userpicks` (
+  `pickuuid` varchar(36) NOT NULL,
+  `creatoruuid` varchar(36) NOT NULL,
+  `toppick` enum('true','false') NOT NULL,
+  `parceluuid` varchar(36) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `description` text NOT NULL,
+  `snapshotuuid` varchar(36) NOT NULL,
+  `user` varchar(255) NOT NULL,
+  `originalname` varchar(255) NOT NULL,
+  `simname` varchar(255) NOT NULL,
+  `posglobal` varchar(255) NOT NULL,
+  `sortorder` int(2) NOT NULL,
+  `enabled` enum('true','false') NOT NULL,
+  PRIMARY KEY  (`pickuuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;

webroot/sql/osprofile.sql

@@ -1,71 +1,23 @@
--- phpMyAdmin SQL Dump
--- version 2.7.0-beta1
--- http://www.phpmyadmin.net
--- 
--- Host: localhost
--- Generatie Tijd: 30 Mar 2009 om 22:05
--- Server versie: 5.0.75
--- PHP Versie: 5.2.6-3ubuntu2
--- 
--- Database: `osprofile`
--- 
-
--- --------------------------------------------------------
-
--- 
--- Tabel structuur voor tabel `usernotes`
--- 
-
-CREATE TABLE `usernotes` (
-  `useruuid` varchar(36) NOT NULL,
-  `targetuuid` varchar(36) NOT NULL,
-  `notes` text NOT NULL,
-  PRIMARY KEY  (`useruuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
--- 
--- Tabel structuur voor tabel `userpicks`
--- 
-
-CREATE TABLE `userpicks` (
-  `pickuuid` varchar(36) NOT NULL,
-  `creatoruuid` varchar(36) NOT NULL,
-  `toppick` enum('true','false') NOT NULL,
-  `parceluuid` varchar(36) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `desc` text NOT NULL,
-  `snapshotuuid` varchar(36) NOT NULL,
-  `user` varchar(255) NOT NULL,
-  `originalname` varchar(255) NOT NULL,
-  `simname` varchar(255) NOT NULL,
-  `posglobal` varchar(255) NOT NULL,
-  `sortorder` int(2) NOT NULL,
-  `enabled` enum('true','false') NOT NULL,
-  PRIMARY KEY  (`pickuuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
--- --------------------------------------------------------
-
--- 
--- Tabel structuur voor tabel `userprofile`
--- 
-
-CREATE TABLE `userprofile` (
-  `useruuid` varchar(36) NOT NULL,
-  `profilePartner` varchar(36) NOT NULL,
-  `profileImage` varchar(36) NOT NULL,
-  `profileAboutText` text NOT NULL,
-  `profileAllowPublish` binary(1) NOT NULL,
-  `profileMaturePublish` binary(1) NOT NULL,
-  `profileURL` varchar(255) NOT NULL,
-  `profileWantToMask` int(3) NOT NULL,
-  `profileWantToText` text NOT NULL,
-  `profileSkillsMask` int(3) NOT NULL,
-  `profileSkillsText` text NOT NULL,
-  `profileLanguages` text NOT NULL,
-  `profileFirstImage` varchar(36) NOT NULL,
-  `profileFirstText` text NOT NULL,
-  PRIMARY KEY  (`useruuid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+CREATE TABLE IF NOT EXISTS `usernotes` (
+  `useruuid` varchar(36) NOT NULL,
+  `targetuuid` varchar(36) NOT NULL,
+  `notes` text NOT NULL,
+  PRIMARY KEY (`useruuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+CREATE TABLE IF NOT EXISTS `userpicks` (
+  `pickuuid` varchar(36) NOT NULL,
+  `creatoruuid` varchar(36) NOT NULL,
+  `toppick` enum('true','false') NOT NULL,
+  `parceluuid` varchar(36) NOT NULL,
+  `name` varchar(255) NOT NULL,
+  `description` text NOT NULL,
+  `snapshotuuid` varchar(36) NOT NULL,
+  `user` varchar(255) NOT NULL,
+  `originalname` varchar(255) NOT NULL,
+  `simname` varchar(255) NOT NULL,
+  `posglobal` varchar(255) NOT NULL,
+  `sortorder` int(2) NOT NULL,
+  `enabled` enum('true','false') NOT NULL,
+  PRIMARY KEY (`pickuuid`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;