Merge https://github.com/redmatrix/hubzilla into pending_merge

1 files changed, 0 insertions, 174 deletions

diff --git a/doc/schemaspy_hubzilla/diagrams/term.1degree.dot b/doc/schemaspy_hubzilla/diagrams/term.1degree.dot
deleted file mode 100644
index ed05722c2..000000000
--- a/doc/schemaspy_hubzilla/diagrams/term.1degree.dot
+++ /dev/null
@@ -1,174 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "oneDegreeRelationshipsDiagram" {
-  graph [
-    rankdir="RL"
-    bgcolor="#f7f7f7"
-    label="\nGenerated by SchemaSpy"
-    labeljust="l"
-    nodesep="0.18"
-    ranksep="0.46"
-    fontname="Helvetica"
-    fontsize="11"
-  ];
-  node [
-    fontname="Helvetica"
-    fontsize="11"
-    shape="plaintext"
-  ];
-  edge [
-    arrowsize="0.8"
-  ];
-  "channel":"channel_hash":w -> "xchan":"xchan_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "hubloc":"hubloc_hash":w -> "channel":"channel_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "hubloc":"hubloc_hash":w -> "xchan":"xchan_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "term":"parent_hash":w -> "channel":"channel_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "term":"parent_hash":w -> "hubloc":"hubloc_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "term":"parent_hash":w -> "xchan":"xchan_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "term":"term_hash":w -> "channel":"channel_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "term":"term_hash":w -> "hubloc":"hubloc_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "term":"term_hash":w -> "xchan":"xchan_hash":e [arrowhead=none dir=back arrowtail=crowodot];
-  "xchan":"xchan_hash":w -> "channel":"channel_hash":e [arrowhead=none dir=back arrowtail=teeodot];
-  "xchan":"xchan_hash":w -> "hubloc":"hubloc_hash":e [arrowhead=none dir=back arrowtail=teeodot];
-  "channel" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="3" ALIGN="LEFT">channel_guid_sig</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="3" ALIGN="LEFT">channel_startpage</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="3" ALIGN="LEFT">channel_pubkey</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="3" ALIGN="LEFT">channel_prvkey</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="3" ALIGN="LEFT">channel_passwd_reset</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="3" ALIGN="LEFT">channel_allow_cid</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="3" ALIGN="LEFT">channel_allow_gid</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="3" ALIGN="LEFT">channel_deny_cid</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="3" ALIGN="LEFT">channel_deny_gid</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 1</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">12 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">14 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "hubloc" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">hubloc</TD></TR>
-      <TR><TD PORT="hubloc_id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">hubloc_id</TD></TR>
-      <TR><TD PORT="hubloc_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_guid</TD></TR>
-      <TR><TD PORT="hubloc_guid_sig" COLSPAN="3" ALIGN="LEFT">hubloc_guid_sig</TD></TR>
-      <TR><TD PORT="hubloc_hash" COLSPAN="3" ALIGN="LEFT">hubloc_hash</TD></TR>
-      <TR><TD PORT="hubloc_addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_addr</TD></TR>
-      <TR><TD PORT="hubloc_network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_network</TD></TR>
-      <TR><TD PORT="hubloc_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_flags</TD></TR>
-      <TR><TD PORT="hubloc_status" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_status</TD></TR>
-      <TR><TD PORT="hubloc_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_url</TD></TR>
-      <TR><TD PORT="hubloc_url_sig" COLSPAN="3" ALIGN="LEFT">hubloc_url_sig</TD></TR>
-      <TR><TD PORT="hubloc_host" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_host</TD></TR>
-      <TR><TD PORT="hubloc_callback" COLSPAN="3" ALIGN="LEFT">hubloc_callback</TD></TR>
-      <TR><TD PORT="hubloc_connect" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_connect</TD></TR>
-      <TR><TD PORT="hubloc_sitekey" COLSPAN="3" ALIGN="LEFT">hubloc_sitekey</TD></TR>
-      <TR><TD PORT="hubloc_updated" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_updated</TD></TR>
-      <TR><TD PORT="hubloc_connected" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_connected</TD></TR>
-      <TR><TD PORT="hubloc_primary" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_primary</TD></TR>
-      <TR><TD PORT="hubloc_orphancheck" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_orphancheck</TD></TR>
-      <TR><TD PORT="hubloc_error" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_error</TD></TR>
-      <TR><TD PORT="hubloc_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hubloc_deleted</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 658 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">14 &gt;</TD></TR>
-    </TABLE>>
-    URL="hubloc.html"
-    tooltip="hubloc"
-  ];
-  "term" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">term</TD></TR>
-      <TR><TD PORT="tid" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">tid</TD><TD PORT="tid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="aid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">aid</TD><TD PORT="aid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="uid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">uid</TD><TD PORT="uid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="oid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">oid</TD><TD PORT="oid.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="otype" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">otype</TD><TD PORT="otype.type" ALIGN="LEFT">tinyint unsigned[3]</TD></TR>
-      <TR><TD PORT="type" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">type</TD><TD PORT="type.type" ALIGN="LEFT">tinyint unsigned[3]</TD></TR>
-      <TR><TD PORT="term" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">term</TD><TD PORT="term.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="url" COLSPAN="2" ALIGN="LEFT">url</TD><TD PORT="url.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="imgurl" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">imgurl</TD><TD PORT="imgurl.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="term_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">term_hash</TD><TD PORT="term_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="parent_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_hash</TD><TD PORT="parent_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 6</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">8 980 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 &gt;</TD></TR>
-    </TABLE>>
-    URL="term.html"
-    tooltip="term"
-  ];
-  "xchan" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">xchan</TD></TR>
-      <TR><TD PORT="xchan_hash" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">xchan_hash</TD></TR>
-      <TR><TD PORT="xchan_guid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_guid</TD></TR>
-      <TR><TD PORT="xchan_guid_sig" COLSPAN="3" ALIGN="LEFT">xchan_guid_sig</TD></TR>
-      <TR><TD PORT="xchan_pubkey" COLSPAN="3" ALIGN="LEFT">xchan_pubkey</TD></TR>
-      <TR><TD PORT="xchan_photo_mimetype" COLSPAN="3" ALIGN="LEFT">xchan_photo_mimetype</TD></TR>
-      <TR><TD PORT="xchan_photo_l" COLSPAN="3" ALIGN="LEFT">xchan_photo_l</TD></TR>
-      <TR><TD PORT="xchan_photo_m" COLSPAN="3" ALIGN="LEFT">xchan_photo_m</TD></TR>
-      <TR><TD PORT="xchan_photo_s" COLSPAN="3" ALIGN="LEFT">xchan_photo_s</TD></TR>
-      <TR><TD PORT="xchan_addr" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_addr</TD></TR>
-      <TR><TD PORT="xchan_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_url</TD></TR>
-      <TR><TD PORT="xchan_connurl" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_connurl</TD></TR>
-      <TR><TD PORT="xchan_follow" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_follow</TD></TR>
-      <TR><TD PORT="xchan_connpage" COLSPAN="3" ALIGN="LEFT">xchan_connpage</TD></TR>
-      <TR><TD PORT="xchan_name" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_name</TD></TR>
-      <TR><TD PORT="xchan_network" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_network</TD></TR>
-      <TR><TD PORT="xchan_instance_url" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_instance_url</TD></TR>
-      <TR><TD PORT="xchan_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_flags</TD></TR>
-      <TR><TD PORT="xchan_photo_date" COLSPAN="3" ALIGN="LEFT">xchan_photo_date</TD></TR>
-      <TR><TD PORT="xchan_name_date" COLSPAN="3" ALIGN="LEFT">xchan_name_date</TD></TR>
-      <TR><TD PORT="xchan_hidden" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_hidden</TD></TR>
-      <TR><TD PORT="xchan_orphan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_orphan</TD></TR>
-      <TR><TD PORT="xchan_censored" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_censored</TD></TR>
-      <TR><TD PORT="xchan_selfcensored" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_selfcensored</TD></TR>
-      <TR><TD PORT="xchan_system" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_system</TD></TR>
-      <TR><TD PORT="xchan_pubforum" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_pubforum</TD></TR>
-      <TR><TD PORT="xchan_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">xchan_deleted</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">2 301 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">35 &gt;</TD></TR>
-    </TABLE>>
-    URL="xchan.html"
-    tooltip="xchan"
-  ];
-}