Merge branch 'dev' into sabre32

21 files changed, 108 insertions, 42 deletions

diff --git a/boot.php b/boot.php
index 764e81292..6cf92d577 100755
--- a/boot.php
+++ b/boot.php
@@ -771,6 +771,7 @@ class App {
 	public static  $groups;
 	public static  $language;
 	public static  $langsave;
+	public static  $rtl = false;
 	public static  $plugins_admin;
 	public static  $module_loaded = false;
 	public static  $query_string;
@@ -2282,6 +2283,12 @@ function construct_page(&$a) {
 	$page    = App::$page;
 	$profile = App::$profile;
 
+	// There's some experimental support for right-to-left text in the view/php/default.php page template.
+	// In v1.9 we started providing direction preference in the per language hstrings.php file
+	// This requires somebody with fluency in a RTL language to make happen
+
+	$page['direction'] = 0; // ((App::$rtl) ? 1 : 0);
+
 	header("Content-type: text/html; charset=utf-8");
 
 	// security headers - see https://securityheaders.io
diff --git a/doc/bbcode.html b/doc/bbcode.html
index 5a51135ea..7a2c969eb 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -14,6 +14,7 @@
 <li>[img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br />
 <div style="clear:both;"></div>
 <li>[code]code[/code] <code>code</code><br />
+<li>[code=xxx]syntax highlighted code[/code] <code>supported languages php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh</code><br />
 <li>[quote]quote[/quote] <blockquote>quote</blockquote><br />
 <li>[quote=Author]Author? Me? No, no, no...[/quote] <br /><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote><br />
 <li> [nobb] may be used to escape bbcode.</ul><br /> 
@@ -83,7 +84,7 @@ or<br /><br />[dl terms="b"]<br />[*= First element term] First element descript
 <li>[spoiler] for hiding spoilers<br /><br /></li>
 
 <li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional</li>
-<li>[qr]text to post[/qr] - create a QR code.</li>
+<li>[qr]text to post[/qr] - create a QR code (if the qrator plugin is installed).</li>
 <li>[toc] - create a table of content in a webpage. Please refer to the <a href="http://ndabas.github.io/toc/" target="_blank">original jquery toc</a> to get more explanations.
 	<ul>
 		<li>Optional param: 'data-toc'. If ommited the default is 'body'</li>
diff --git a/doc/database/db_abook.bb b/doc/database/db_abook.bb
index 364429884..a346480d7 100644
--- a/doc/database/db_abook.bb
+++ b/doc/database/db_abook.bb
@@ -15,10 +15,6 @@
 [/td][/tr]
 [tr][td]abook_closeness[/td][td]"closeness" value for optional affinity tool, 0-99[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]99[/td][td]
 [/td][/tr]
-[tr][td]abook_rating[/td][td]The channel owner's (public) rating of this connection -10 to +10, default 0 or unrated[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
-[/td][/tr]
-[tr][td]abook_rating_text[/td][td]The channel owner's (public) rating of this connection free form text[/td][td]text[/td][td]NO[/td][td]MUL[/td][td][/td][td]
-[/td][/tr]
 [tr][td]abook_created[/td][td]Datetime this record was created[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
 [tr][td]abook_updated[/td][td]Datetime this record was modified[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
@@ -32,16 +28,27 @@
 [tr][td]abook_profile[/td][td]profile.guid of profile to display to this connection if authenticated[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
 [/td][/tr]
 [tr][td]abook_blocked[/td][td]Bi-directional communications with this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_ignored[/td][td]Incoming communications from this channel are blocked, regardless of other permissions.  [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_hidden[/td][td]This connection will not be shown as a connection to anybody but the channel owner[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_archived[/td][td]This connection is likely non-functioning and the entry and conversations are preserved, but further polled communications will not be attempted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_pending[/td][td]A connection request was received from this channel but has not been approved by the channel owner, public communications may still be visible but no additional permissions have been granted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_unconnected[/td][td]currently unused. Projected usage is to indicate "one-way" connections which were insitgated on this end but are still pending on the remote end. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_self[/td][td]is a special case where the owner is the target. Every channel has one abook entry with abook_self and with a target abook_xchan set to channel.channel_hash . When this flag is present, abook_my_perms is the default permissions granted to all new connections and several other fields are unused.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_feed[/td][td]indicates this connection is an RSS/Atom feed and may trigger special handling.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_instance[/td][td]comma separated list of site urls of all channel clones that this connection is connected with (used only for singleton networks which don't support cloning)[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [/table]
 
 
diff --git a/doc/database/db_addon.bb b/doc/database/db_addon.bb
index afa06d56c..bccd295f5 100644
--- a/doc/database/db_addon.bb
+++ b/doc/database/db_addon.bb
@@ -3,7 +3,7 @@
 [/th][/tr]
 [tr][td]id[/td][td][/td]generated index[td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment
 [/td][/tr]
-[tr][td]name[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]aname[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]version[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]hidden[/td][td]currently unused[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]timestamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td]
+[tr][td]tstamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td]
 [/td][/tr]
 [tr][td]plugin_admin[/td][td]1 = has admin config, 0 = has no admin config[/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]0[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_app.bb b/doc/database/db_app.bb
index 7076bffdd..09df473ee 100644
--- a/doc/database/db_app.bb
+++ b/doc/database/db_app.bb
@@ -27,8 +27,20 @@
 [/td][/tr]
 [tr][td]app_page[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
-[tr][td]app_requires[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
+[tr][td]app_requires[/td][td]access rules[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
+
+[tr][td]app_created[/td][td]datetime of app creation[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+[tr][td]app_edited[/td][td]datetime of last app edit[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+
+[tr][td]app_deleted[/td][td]1 = deleted, 0 = normal[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+[tr][td]app_system[/td][td]1 = imported system app, 0 = member created app[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+
+
 [/table]
 
 Storage for personal apps
diff --git a/doc/database/db_attach.bb b/doc/database/db_attach.bb
index 7d2befb47..5098401de 100644
--- a/doc/database/db_attach.bb
+++ b/doc/database/db_attach.bb
@@ -29,9 +29,11 @@
 [/td][/tr]
 [tr][td]os_storage[/td][td]if 0, data contains content; if 1 data contains path to content (always 1 in hubzilla)[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
+[tr][td]os_path[/td][td]under construction, store the system path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]display_path[/td][td]under construction, store the human readable path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]data[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]content[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]created[/td][td]creation time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_channel.bb b/doc/database/db_channel.bb
index 6f53517d8..518ff0978 100644
--- a/doc/database/db_channel.bb
+++ b/doc/database/db_channel.bb
@@ -35,6 +35,8 @@
 [/td][/tr]
 [tr][td]channel_dirdate[/td][td]time when directory was last pinged. Must do this once a month[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
+[tr][td]channel_lastpost[/td][td]date of last post for this channel. May not be fully implemented[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
+[/td][/tr]
 [tr][td]channel_deleted[/td][td]time when channel was deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
 [tr][td]channel_max_anon_mail[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td]
@@ -95,6 +97,8 @@
 [/td][/tr]
 [tr][td]channel_system[/td][td]if 1, this is the special system channel on this site[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td]
 [/td][/tr]
+[tr][td]channel_moved[/td][td]URL of relocated channel, making this instance abandoned if set[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
+[/td][/tr]
 [/table]
 
 Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
diff --git a/doc/database/db_chatpresence.bb b/doc/database/db_chatpresence.bb
index 28cd6f207..0a7f666c9 100644
--- a/doc/database/db_chatpresence.bb
+++ b/doc/database/db_chatpresence.bb
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]cp_status[/td][td]text status description e.g. "online"[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]cp_client[/td][td][/td]IP address of this client[td]char(128)[/td][td]NO[/td][td][/td][td][/td][td]
+[tr][td]cp_client[/td][td]IP address of this client[/td][td]char(128)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
 [/table]
 
diff --git a/doc/database/db_clients.bb b/doc/database/db_clients.bb
index d342b529f..0c66a4fc2 100644
--- a/doc/database/db_clients.bb
+++ b/doc/database/db_clients.bb
@@ -7,7 +7,7 @@
 [/td][/tr]
 [tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
+[tr][td]clname[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]icon[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_event.bb b/doc/database/db_event.bb
index 7c31d7fde..ad3c15789 100644
--- a/doc/database/db_event.bb
+++ b/doc/database/db_event.bb
@@ -15,9 +15,9 @@
 [/td][/tr]
 [tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]start[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]dtstart[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]finish[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]dtend[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]summary[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -25,13 +25,13 @@
 [/td][/tr]
 [tr][td]location[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]etype[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]nofinish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
 [tr][td]adjust[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]1[/td][td]
 [/td][/tr]
-[tr][td]ignore[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]dismissed[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
 [tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -41,6 +41,24 @@
 [/td][/tr]
 [tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
+
+[tr][td]event_status[/td][td][/td][td]charr(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_status_date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_percent[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_repeat[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_sequence[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_priority[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_vdata[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]cal_id[/td][td][/td][td]int(10)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+
 [/table]
 
 Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
\ No newline at end of file
diff --git a/doc/database/db_groups.bb b/doc/database/db_groups.bb
index 078d96464..73265b90e 100644
--- a/doc/database/db_groups.bb
+++ b/doc/database/db_groups.bb
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [/table]
 
diff --git a/doc/database/db_hook.bb b/doc/database/db_hook.bb
index 0812b1b41..233062f98 100644
--- a/doc/database/db_hook.bb
+++ b/doc/database/db_hook.bb
@@ -7,9 +7,11 @@
 [/td][/tr]
 [tr][td]file[/td][td]relative filename of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]function[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]fn[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]priority[/td][td]not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
+[tr][td]priority[/td][td]can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
+[/td][/tr]
+[tr][td]hook_version[/td][td]version 0 hooks must have two arguments, the App and the hook data. version 1 hooks have 1 argument - the hook data[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
 [/td][/tr]
 [/table]
 
diff --git a/doc/database/db_item.bb b/doc/database/db_item.bb
index e4e594196..6383e13f8 100644
--- a/doc/database/db_item.bb
+++ b/doc/database/db_item.bb
@@ -51,7 +51,7 @@
 [/td][/tr]
 [tr][td]obj_type[/td][td]ActivityStreams object type (old style URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
-[tr][td]object[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]obj[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]tgt_type[/td][td]ActivityStreams target type if applicable (URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
diff --git a/doc/database/db_notify.bb b/doc/database/db_notify.bb
index 42f9350e5..4787266cd 100644
--- a/doc/database/db_notify.bb
+++ b/doc/database/db_notify.bb
@@ -5,7 +5,7 @@
 [/td][/tr]
 [tr][td]hash[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]xname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -25,7 +25,7 @@
 [/td][/tr]
 [tr][td]seen[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]ntype[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_photo.bb b/doc/database/db_photo.bb
index 6a0cdf362..91840ec1e 100644
--- a/doc/database/db_photo.bb
+++ b/doc/database/db_photo.bb
@@ -23,15 +23,15 @@
 [/td][/tr]
 [tr][td]filename[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td]
+[tr][td]mimetype[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td]
 [/td][/tr]
 [tr][td]height[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]width[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]size[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]filesize[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]data[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]content[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]scale[/td][td][/td][td]tinyint(3)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_profile.bb b/doc/database/db_profile.bb
index 83db75713..717fae585 100644
--- a/doc/database/db_profile.bb
+++ b/doc/database/db_profile.bb
@@ -15,7 +15,7 @@
 [/td][/tr]
 [tr][td]hide_friends[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]fullname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]pdesc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -41,7 +41,7 @@
 [/td][/tr]
 [tr][td]marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]with[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]partner[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]howlong[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
@@ -73,7 +73,7 @@
 [/td][/tr]
 [tr][td]romance[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]work[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]employment[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]education[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_term.bb b/doc/database/db_term.bb
index e1f6415fa..bd155fe21 100644
--- a/doc/database/db_term.bb
+++ b/doc/database/db_term.bb
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]otype[/td][td]type of linked thing[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]ttype[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]term[/td][td]the actual taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/include/group.php b/include/group.php
index a4938b848..10853ff6b 100644
--- a/include/group.php
+++ b/include/group.php
@@ -17,7 +17,7 @@ function group_add($uid,$name,$public = 0) {
 			$z = q("SELECT * FROM `groups` WHERE `id` = %d LIMIT 1",
 				intval($r)
 			);
-			if(count($z) && $z[0]['deleted']) {
+			if(($z) && $z[0]['deleted']) {
 				/*$r = q("UPDATE `groups` SET `deleted` = 0 WHERE `uid` = %d AND `gname` = '%s' LIMIT 1",
 					intval($uid),
 					dbesc($name)
@@ -129,7 +129,7 @@ function group_byname($uid,$name) {
 		intval($uid),
 		dbesc($name)
 	);
-	if(count($r))
+	if($r)
 		return $r[0]['id'];
 	return false;
 }
@@ -178,11 +178,11 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 		intval($gid),
 		dbesc($member)
 	);
-	if(count($r))
+	if($r)
 		return true;	// You might question this, but 
 				// we indicate success because the group member was in fact created
 				// -- It was just created at another time
- 	if(! count($r))
+ 	if(! $r)
 		$r = q("INSERT INTO `group_member` (`uid`, `gid`, `xchan`)
 			VALUES( %d, %d, '%s' ) ",
 			intval($uid),
@@ -205,7 +205,7 @@ function group_get_members($gid) {
 			intval(local_channel()),
 			intval(local_channel())
 		);
-		if(count($r))
+		if($r)
 			$ret = $r;
 	}
 	return $ret;
@@ -218,7 +218,7 @@ function group_get_members_xchan($gid) {
 			intval($gid),
 			intval(local_channel())
 		);
-		if(count($r)) {
+		if($r) {
 			foreach($r as $rr) {
 				$ret[] = $rr['xchan'];
 			}
@@ -236,7 +236,7 @@ function mini_group_select($uid,$group = '') {
 		intval($uid)
 	);
 	$grps[] = array('name' => '', 'hash' => '0', 'selected' => '');
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr) {
 			$grps[] = array('name' => $rr['gname'], 'id' => $rr['hash'], 'selected' => (($group == $rr['hash']) ? 'true' : ''));
 		}
@@ -279,7 +279,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 		$member_of = groups_containing(local_channel(),$cid);
 	} 
 
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 			
@@ -356,7 +356,7 @@ function groups_containing($uid,$c) {
 	);
 
 	$ret = array();
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr)
 			$ret[] = $rr['gid'];
 	}
diff --git a/include/network.php b/include/network.php
index d922799b6..062f2c2bf 100644
--- a/include/network.php
+++ b/include/network.php
@@ -189,6 +189,10 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
  */
 function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 
+//	logger('url: ' . $url);
+//	logger('params: ' . print_r($params,true));
+//	logger('opts: ' . print_r($opts,true));
+
 	$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
 
 	$ch = curl_init($url);
@@ -214,14 +218,15 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 
 	if(x($opts,'headers')) {
 		@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
-logger('headers: ' . print_r($opts['headers'],true) . 'redir: ' . $redirects);
 	}
  
 	if(x($opts,'nobody'))
 		@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 
-	if(x($opts,'custom'))
+	if(x($opts,'custom')) {
 		@curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']);
+		@curl_setopt($ch, CURLOPT_POST,0);
+	}
 
 
 	if(x($opts,'timeout') && intval($opts['timeout'])) {
diff --git a/util/po2php.php b/util/po2php.php
index ab8c495f9..a72a65ba1 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -3,14 +3,21 @@
 
 function po2php_run($argc,$argv) {
 
-	if ($argc!=2) {
+	if ($argc < 2) {
 		print "Usage: ".$argv[0]." <file.po>\n\n";
 		return;
 	}
-	
+
+	$rtl = false;	
+
 	$pofile = $argv[1];
 	$outfile = dirname($pofile)."/hstrings.php";
 
+	if($argc > 2) {
+		if($argv[2] === 'rtl')
+			$rtl = true;
+	}
+
 	if(strstr($outfile,'util'))
 		$lang = 'en';
 	else
@@ -53,6 +60,7 @@ function po2php_run($argc,$argv) {
 			$out .= '	return '.$cond.';'."\n";
 			$out .= '}}'."\n";
 		}
+		$out .= 'App::$rtl = ' . intval($rtl) . ';';
 		
 		if ($k!="" && substr($l,0,7)=="msgstr "){
 			if ($ink) { $ink = False; $out .= 'App::$strings["'.$k.'"] = '; }
diff --git a/view/php/default.php b/view/php/default.php
index ad6b7a3d1..f5be4fa35 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -5,7 +5,7 @@
   <script>var baseurl="<?php echo z_root() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
-<body>
+<body <?php if($page['direction']) echo 'dir="rtl"' ?> >
 	<?php if(x($page,'banner')) echo $page['banner']; ?>
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
 	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>