1 files changed, 56 insertions, 9 deletions
diff --git a/OpenSim/Server/Handlers/Web/WebServerInConnector.cs b/OpenSim/Server/Handlers/Web/WebServerInConnector.cs
index 568b7d6..1dedfa3 100644
--- a/OpenSim/Server/Handlers/Web/WebServerInConnector.cs
+++ b/OpenSim/Server/Handlers/Web/WebServerInConnector.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Server.Handlers.Web
            foreach (DictionaryEntry h in headers)
                m_log.InfoFormat("[WEB SERVICE]:  {0} method path {1} header {2} = {3}", method, reqpath, (string) h.Key, (string) h.Value);
            foreach (String q in query)
-                m_log.InfoFormat("[WEB SERVICE]:  {0} method path {1} query {2}", method, reqpath, q);
+                m_log.InfoFormat("[WEB SERVICE]:  {0} method path {1} query {2} value {3}", method, reqpath, q, (string) request[q]);
            reply["int_response_code"] = 200;
            if ("GET" == method)
@@ -214,14 +214,12 @@ namespace OpenSim.Server.Handlers.Web
                    }
                    else if ("list" == fields["doit"].ToString())
                    {
-                        List< Hashtable > rows = m_database.Select("GridUser", "Login > UNIX_TIMESTAMP(FROM_UNIXTIME(UNIX_TIMESTAMP(now()) - 2419200))");
+                        List< Hashtable > rows = m_database.Select("UserAccounts", 
-                        foreach (Hashtable row in rows)
+                            "CONCAT(FirstName,' ',LastName) as Name,UserTitle as Title,UserLevel as Level,UserFlags as Flags,PrincipalID as UUID", 
-                        {
+                            "", "Name");
-                            string line = "";
+                        reply["str_response_string"] = "<html><title>member accounts</title><head></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" +
-                            foreach (DictionaryEntry c in row)
+                            table(rows, new string[5] {"Name", "Title", "Level", "Flags", "UUID"}, "member accounts", 
-                                line = line + " | " + (string) c.Value;
+                                "account.html?doit=edit&token=" + fields["token"].ToString(), "UUID") + "<p>" + button("my account") + "</p></body></html>";
-                            m_log.Info("[MariaDB RAW]:  " + line);
-                        }
                    }
                    else
                    {
@@ -281,8 +279,10 @@ namespace OpenSim.Server.Handlers.Web
                     + form("account.html", fields["token"].ToString(), 
                          hidden("firstName", fields["firstName"].ToString())
                        + hidden("lastName", fields["lastName"].ToString())
+//                      + hidden("UUID", fields["UUID"].ToString())
                        +  text("email", "email", "email", fields["email"].ToString(), 0, false)
                        + text("password", "password", "password", "", 14, false)
+//                      +  text("title", "text", "title", fields["title"].ToString(), 0, false)
                        + select("type", "type",
                              option("", false)
                            + option("approved", true)
@@ -303,6 +303,53 @@ namespace OpenSim.Server.Handlers.Web
        {
            return "<html>\n  <head>\n    <title>" + title + "</title>\n  </head>\n  <body>\n";
        }
+        // account.html?token=&UUID=....
+        private string table(List< Hashtable > rows, string[] fields, string caption, string URL, string id)
+        {
+            string tbl = "<table border=\"1\"><caption>" + caption + "</caption>";
+            bool head = true;
+            string address = "";
+            string addrend = "";
+            foreach (Hashtable row in rows)
+            {
+                if (0 == fields.Length)
+                {
+                    int c = 0;
+                    foreach (DictionaryEntry r in row)
+                        c++;
+                    fields = new string[c];
+                    c = 0;
+                    foreach (DictionaryEntry r in row)
+                        fields[c++] = (string) r.Key;
+                }
+                string line = "<tr>";
+                address = "";
+                if ("" != URL)
+                {
+                    address = "<a href=\"" + URL;
+                    addrend = "</a>";
+                }
+                if ("" != id)
+                    address = address + "&" + id + "=" + row[id] + "\">";
+                if (head)
+                {
+                    foreach (string s in fields)
+                        line = line + "<th>" + s + "</th>";
+                    tbl = tbl + line + "</tr>\n";
+                    head = false;
+                }
+                line = "<tr>";
+                foreach (string s in fields)
+                {
+                    if (s == id)
+                        line = line + "<td>" + address + row[s] + addrend + "</td>";
+                    else
+                        line = line + "<td>" + row[s] + "</td>";
+                }
+                tbl = tbl + line + "</tr>\n";
+            }
+            return tbl + "</table>";
+        }
        private string form(string action, string token, string form)
        {
            return  "    <form action=\"" + action + "\" method=\"POST\">\n" + hidden("token", token) + form + "    </form>\n";

diff --git a/OpenSim/Server/Handlers/Web/WebServerInConnector.cs b/OpenSim/Server/Handlers/Web/WebServerInConnector.cs index 568b7d6..1dedfa3 100644 --- a/OpenSim/Server/Handlers/Web/WebServerInConnector.cs +++ b/OpenSim/Server/Handlers/Web/WebServerInConnector.cs
@@ -143,7 +143,7 @@ namespace OpenSim.Server.Handlers.Web
143	foreach (DictionaryEntry h in headers)	143	foreach (DictionaryEntry h in headers)
144	m_log.InfoFormat("[WEB SERVICE]: {0} method path {1} header {2} = {3}", method, reqpath, (string) h.Key, (string) h.Value);	144	m_log.InfoFormat("[WEB SERVICE]: {0} method path {1} header {2} = {3}", method, reqpath, (string) h.Key, (string) h.Value);
145	foreach (String q in query)	145	foreach (String q in query)
146	m_log.InfoFormat("[WEB SERVICE]: {0} method path {1} query {2}", method, reqpath, q);	146	m_log.InfoFormat("[WEB SERVICE]: {0} method path {1} query {2} value {3}", method, reqpath, q, (string) request[q]);
147		147
148	reply["int_response_code"] = 200;	148	reply["int_response_code"] = 200;
149	if ("GET" == method)	149	if ("GET" == method)
@@ -214,14 +214,12 @@ namespace OpenSim.Server.Handlers.Web
214	}	214	}
215	else if ("list" == fields["doit"].ToString())	215	else if ("list" == fields["doit"].ToString())
216	{	216	{
217	List< Hashtable > rows = m_database.Select("GridUser", "Login > UNIX_TIMESTAMP(FROM_UNIXTIME(UNIX_TIMESTAMP(now()) - 2419200))");	217	List< Hashtable > rows = m_database.Select("UserAccounts",
218	foreach (Hashtable row in rows)	218	"CONCAT(FirstName,' ',LastName) as Name,UserTitle as Title,UserLevel as Level,UserFlags as Flags,PrincipalID as UUID",
219	{	219	"", "Name");
220	string line = "";	220	reply["str_response_string"] = "<html><title>member accounts</title><head></head><body bgcolor=\"black\" text=\"white\" alink=\"red\" link=\"blue\" vlink=\"purple\">" +
221	foreach (DictionaryEntry c in row)	221	table(rows, new string[5] {"Name", "Title", "Level", "Flags", "UUID"}, "member accounts",
222	line = line + " \| " + (string) c.Value;	222	"account.html?doit=edit&token=" + fields["token"].ToString(), "UUID") + "<p>" + button("my account") + "</p></body></html>";
223	m_log.Info("[MariaDB RAW]: " + line);
224	}
225	}	223	}
226	else	224	else
227	{	225	{
@@ -281,8 +279,10 @@ namespace OpenSim.Server.Handlers.Web
281	+ form("account.html", fields["token"].ToString(),	279	+ form("account.html", fields["token"].ToString(),
282	hidden("firstName", fields["firstName"].ToString())	280	hidden("firstName", fields["firstName"].ToString())
283	+ hidden("lastName", fields["lastName"].ToString())	281	+ hidden("lastName", fields["lastName"].ToString())
		282	// + hidden("UUID", fields["UUID"].ToString())
284	+ text("email", "email", "email", fields["email"].ToString(), 0, false)	283	+ text("email", "email", "email", fields["email"].ToString(), 0, false)
285	+ text("password", "password", "password", "", 14, false)	284	+ text("password", "password", "password", "", 14, false)
		285	// + text("title", "text", "title", fields["title"].ToString(), 0, false)
286	+ select("type", "type",	286	+ select("type", "type",
287	option("", false)	287	option("", false)
288	+ option("approved", true)	288	+ option("approved", true)
@@ -303,6 +303,53 @@ namespace OpenSim.Server.Handlers.Web
303	{	303	{
304	return "<html>\n <head>\n <title>" + title + "</title>\n </head>\n <body>\n";	304	return "<html>\n <head>\n <title>" + title + "</title>\n </head>\n <body>\n";
305	}	305	}
		306	// account.html?token=&UUID=....
		307	private string table(List< Hashtable > rows, string[] fields, string caption, string URL, string id)
		308	{
		309	string tbl = "<table border=\"1\"><caption>" + caption + "</caption>";
		310	bool head = true;
		311	string address = "";
		312	string addrend = "";
		313	foreach (Hashtable row in rows)
		314	{
		315	if (0 == fields.Length)
		316	{
		317	int c = 0;
		318	foreach (DictionaryEntry r in row)
		319	c++;
		320	fields = new string[c];
		321	c = 0;
		322	foreach (DictionaryEntry r in row)
		323	fields[c++] = (string) r.Key;
		324	}
		325	string line = "<tr>";
		326	address = "";
		327	if ("" != URL)
		328	{
		329	address = "<a href=\"" + URL;
		330	addrend = "</a>";
		331	}
		332	if ("" != id)
		333	address = address + "&" + id + "=" + row[id] + "\">";
		334	if (head)
		335	{
		336	foreach (string s in fields)
		337	line = line + "<th>" + s + "</th>";
		338	tbl = tbl + line + "</tr>\n";
		339	head = false;
		340	}
		341	line = "<tr>";
		342	foreach (string s in fields)
		343	{
		344	if (s == id)
		345	line = line + "<td>" + address + row[s] + addrend + "</td>";
		346	else
		347	line = line + "<td>" + row[s] + "</td>";
		348	}
		349	tbl = tbl + line + "</tr>\n";
		350	}
		351	return tbl + "</table>";
		352	}
306	private string form(string action, string token, string form)	353	private string form(string action, string token, string form)
307	{	354	{
308	return " <form action=\"" + action + "\" method=\"POST\">\n" + hidden("token", token) + form + " </form>\n";	355	return " <form action=\"" + action + "\" method=\"POST\">\n" + hidden("token", token) + form + " </form>\n";