Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 20 insertions, 0 deletions

diff --git a/view/en/cert_bad_eml.tpl b/view/en/cert_bad_eml.tpl
new file mode 100644
index 000000000..f4b197131
--- /dev/null
+++ b/view/en/cert_bad_eml.tpl
@@ -0,0 +1,20 @@
+This is the webserver at {{$sitename}};
+   
+A routine check indicates the SSL certificate for this website is
+not valid. Your website cannot fully participate in the RedMatrix
+until this is resolved. Please check your certificate and with your
+certificate provider or service provider to ensure it is "browser valid" 
+and installed correctly. Self-signed certificates are NOT SUPPORTED 
+and NOT ALLOWED in the RedMatrix.
+
+The check is performed by fetching a URL from your website with strict
+SSL checking enabled, and if this fails, checking again with SSL 
+checks disabled. It's possible a transient error could produce this
+message, but if any recent configuration changes have been made,
+or if you receive this message more than once, please check your 
+certificate. 
+
+The error message is '{{$error}}'.   
+
+Apologies for the inconvenience, 
+	your web server at {{$siteurl}}
\ No newline at end of file