Merge remote-tracking branch 'upstream/master'

1 files changed, 0 insertions, 179 deletions

diff --git a/hubzilla_er/diagrams/channel.implied2degrees.dot b/hubzilla_er/diagrams/channel.implied2degrees.dot
deleted file mode 100644
index 4cc3b73a3..000000000
--- a/hubzilla_er/diagrams/channel.implied2degrees.dot
+++ /dev/null
@@ -1,179 +0,0 @@
-// dot 2.26.3 on Linux 3.2.0-4-686-pae
-// SchemaSpy rev 590
-digraph "impliedTwoDegreesRelationshipsDiagram" {
-  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"
-  ];
-  "likes":"channel_id":w -> "channel":"channel_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "likes":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "mail":"account_id":w -> "account":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"channel_id":w -> "channel":"channel_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "mail":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"channel_id":w -> "channel":"channel_id.type":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "profext":"id":w -> "verify":"elipses":e [arrowhead=none dir=back arrowtail=teeodot style=dashed];
-  "profext":"k":w -> "cache":"elipses":e [arrowhead=none dir=back arrowtail=crowodot style=dashed];
-  "account" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">account</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 &gt;</TD></TR>
-    </TABLE>>
-    URL="account.html"
-    tooltip="account"
-  ];
-  "cache" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">cache</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">21 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 &gt;</TD></TR>
-    </TABLE>>
-    URL="cache.html"
-    tooltip="cache"
-  ];
-  "channel" [
-    label=<
-    <TABLE BORDER="2" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">channel</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="2" BGCOLOR="#bed1b8" ALIGN="LEFT">channel_id</TD><TD PORT="channel_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_account_id" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_account_id</TD><TD PORT="channel_account_id.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_primary" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_primary</TD><TD PORT="channel_primary.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_name" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_name</TD><TD PORT="channel_name.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_address" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_address</TD><TD PORT="channel_address.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_guid</TD><TD PORT="channel_guid.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_guid_sig" COLSPAN="2" ALIGN="LEFT">channel_guid_sig</TD><TD PORT="channel_guid_sig.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_hash" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_hash</TD><TD PORT="channel_hash.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_timezone" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_timezone</TD><TD PORT="channel_timezone.type" ALIGN="LEFT">char[128]</TD></TR>
-      <TR><TD PORT="channel_location" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_location</TD><TD PORT="channel_location.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_theme" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_theme</TD><TD PORT="channel_theme.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_startpage" COLSPAN="2" ALIGN="LEFT">channel_startpage</TD><TD PORT="channel_startpage.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_pubkey" COLSPAN="2" ALIGN="LEFT">channel_pubkey</TD><TD PORT="channel_pubkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_prvkey" COLSPAN="2" ALIGN="LEFT">channel_prvkey</TD><TD PORT="channel_prvkey.type" ALIGN="LEFT">text[65535]</TD></TR>
-      <TR><TD PORT="channel_notifyflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_notifyflags</TD><TD PORT="channel_notifyflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_pageflags" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_pageflags</TD><TD PORT="channel_pageflags.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_dirdate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_dirdate</TD><TD PORT="channel_dirdate.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_lastpost" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_lastpost</TD><TD PORT="channel_lastpost.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_deleted" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_deleted</TD><TD PORT="channel_deleted.type" ALIGN="LEFT">datetime[19]</TD></TR>
-      <TR><TD PORT="channel_max_anon_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_anon_mail</TD><TD PORT="channel_max_anon_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_max_friend_req" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_max_friend_req</TD><TD PORT="channel_max_friend_req.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_expire_days" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_expire_days</TD><TD PORT="channel_expire_days.type" ALIGN="LEFT">int[10]</TD></TR>
-      <TR><TD PORT="channel_passwd_reset" COLSPAN="2" ALIGN="LEFT">channel_passwd_reset</TD><TD PORT="channel_passwd_reset.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_default_group" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_default_group</TD><TD PORT="channel_default_group.type" ALIGN="LEFT">char[255]</TD></TR>
-      <TR><TD PORT="channel_allow_cid" COLSPAN="2" ALIGN="LEFT">channel_allow_cid</TD><TD PORT="channel_allow_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_allow_gid" COLSPAN="2" ALIGN="LEFT">channel_allow_gid</TD><TD PORT="channel_allow_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_cid" COLSPAN="2" ALIGN="LEFT">channel_deny_cid</TD><TD PORT="channel_deny_cid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_deny_gid" COLSPAN="2" ALIGN="LEFT">channel_deny_gid</TD><TD PORT="channel_deny_gid.type" ALIGN="LEFT">mediumtext[16777215]</TD></TR>
-      <TR><TD PORT="channel_r_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_stream</TD><TD PORT="channel_r_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_profile" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_profile</TD><TD PORT="channel_r_profile.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_photos</TD><TD PORT="channel_r_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_abook" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_abook</TD><TD PORT="channel_r_abook.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_stream" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_stream</TD><TD PORT="channel_w_stream.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_wall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_wall</TD><TD PORT="channel_w_wall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_tagwall" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_tagwall</TD><TD PORT="channel_w_tagwall.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_comment" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_comment</TD><TD PORT="channel_w_comment.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_mail" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_mail</TD><TD PORT="channel_w_mail.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_photos" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_photos</TD><TD PORT="channel_w_photos.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_chat" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_chat</TD><TD PORT="channel_w_chat.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_delegate" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_delegate</TD><TD PORT="channel_a_delegate.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_storage</TD><TD PORT="channel_r_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_storage" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_storage</TD><TD PORT="channel_w_storage.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_r_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_r_pages</TD><TD PORT="channel_r_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_pages" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_pages</TD><TD PORT="channel_w_pages.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_a_republish" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_a_republish</TD><TD PORT="channel_a_republish.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_w_like" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_w_like</TD><TD PORT="channel_w_like.type" ALIGN="LEFT">int unsigned[10]</TD></TR>
-      <TR><TD PORT="channel_removed" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_removed</TD><TD PORT="channel_removed.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD PORT="channel_system" COLSPAN="2" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_system</TD><TD PORT="channel_system.type" ALIGN="LEFT">bit[0]</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 0</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">5 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">3 &gt;</TD></TR>
-    </TABLE>>
-    URL="channel.html"
-    tooltip="channel"
-  ];
-  "likes" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">likes</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="liker" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">liker</TD></TR>
-      <TR><TD PORT="likee" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">likee</TD></TR>
-      <TR><TD PORT="iid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">iid</TD></TR>
-      <TR><TD PORT="verb" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">verb</TD></TR>
-      <TR><TD PORT="target_type" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_type</TD></TR>
-      <TR><TD PORT="target_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">target_id</TD></TR>
-      <TR><TD PORT="target" COLSPAN="3" ALIGN="LEFT">target</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 2</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="likes.html"
-    tooltip="likes"
-  ];
-  "mail" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">mail</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="convid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">convid</TD></TR>
-      <TR><TD PORT="mail_flags" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_flags</TD></TR>
-      <TR><TD PORT="from_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">from_xchan</TD></TR>
-      <TR><TD PORT="to_xchan" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">to_xchan</TD></TR>
-      <TR><TD PORT="account_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">account_id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="title" COLSPAN="3" ALIGN="LEFT">title</TD></TR>
-      <TR><TD PORT="body" COLSPAN="3" ALIGN="LEFT">body</TD></TR>
-      <TR><TD PORT="sig" COLSPAN="3" ALIGN="LEFT">sig</TD></TR>
-      <TR><TD PORT="attach" COLSPAN="3" ALIGN="LEFT">attach</TD></TR>
-      <TR><TD PORT="mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mid</TD></TR>
-      <TR><TD PORT="parent_mid" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">parent_mid</TD></TR>
-      <TR><TD PORT="mail_deleted" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_deleted</TD></TR>
-      <TR><TD PORT="mail_replied" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_replied</TD></TR>
-      <TR><TD PORT="mail_isreply" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_isreply</TD></TR>
-      <TR><TD PORT="mail_seen" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_seen</TD></TR>
-      <TR><TD PORT="mail_recalled" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_recalled</TD></TR>
-      <TR><TD PORT="mail_obscured" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">mail_obscured</TD></TR>
-      <TR><TD PORT="created" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">created</TD></TR>
-      <TR><TD PORT="expires" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">expires</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">7 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="mail.html"
-    tooltip="mail"
-  ];
-  "profext" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">profext</TD></TR>
-      <TR><TD PORT="id" COLSPAN="3" BGCOLOR="#bed1b8" ALIGN="LEFT">id</TD></TR>
-      <TR><TD PORT="channel_id" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">channel_id</TD></TR>
-      <TR><TD PORT="hash" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">hash</TD></TR>
-      <TR><TD PORT="k" COLSPAN="3" BGCOLOR="#f4f7da" ALIGN="LEFT">k</TD></TR>
-      <TR><TD PORT="v" COLSPAN="3" ALIGN="LEFT">v</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">&lt; 3</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">0 rows</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">  </TD></TR>
-    </TABLE>>
-    URL="profext.html"
-    tooltip="profext"
-  ];
-  "verify" [
-    label=<
-    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="#ffffff">
-      <TR><TD COLSPAN="3" BGCOLOR="#9bab96" ALIGN="CENTER">verify</TD></TR>
-      <TR><TD PORT="elipses" COLSPAN="3" ALIGN="LEFT">...</TD></TR>
-      <TR><TD ALIGN="LEFT" BGCOLOR="#f7f7f7">  </TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">1 row</TD><TD ALIGN="RIGHT" BGCOLOR="#f7f7f7">20 &gt;</TD></TR>
-    </TABLE>>
-    URL="verify.html"
-    tooltip="verify"
-  ];
-}