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

.homeinstall/hubzilla-config.txt.template

@@ -9,7 +9,9 @@ db_pass=
 ###############################################
 ### MANDATORY - let's encrypt #################
 #
-# Hubilla does not allow ecrypted communication, httpS.
+# Hubilla requires encrypted communication via secure HTTP (HTTPS).
+# This script automates installation of an SSL certificate from
+# Let's Encrypt (https://letsencrypt.org)
 #
 # Please give the domain name of your hub
 #
@@ -136,12 +138,12 @@ backup_device_pass=
 ### OPTIONAL - do not mess with things below ##
 #              (...if you are not certain)
 #
-# Usally you are done here
+# Usually you are done here
-# All what comes below is OPTIONAL
+# Everything below is OPTIONAL
 #
 ###############################################
 #
-# Database for huzilla
+# Database for hubzilla
 hubzilla_db_name=hubzilla
 hubzilla_db_user=hubzilla
 hubzilla_db_pass=$db_pass
@@ -168,7 +170,7 @@ phpmyadminpass=$db_pass
 #   * in eclipse: switch php debugger from zend to xdebug
 #   * in eclipse: add local hubzilla github repository
 #
-# Wich user will use eclipse?
+# Which user will use eclipse?
 # Leave this empty if you do not want to prepare hubzilla for debugging
 #
 #developer_name=

.homeinstall/hubzilla-setup.sh

@@ -5,7 +5,7 @@
 # 
 # This file automates the installation of hubzilla under Debian Linux
 #
-# 1) Edit the file "hubzilla-config.txt"
+# 1) Copy the file "hubzilla-config.txt.template" to "hubzilla-config.txt"
 #       Follow the instuctions there
 # 
 # 2) Switch to user "root" by typing "su -"
@@ -92,12 +92,12 @@
 # Credits
 # -------
 #
-# The srcipt is based on Thomas Willinghams script "debian-setup.sh"
+# The script is based on Thomas Willinghams script "debian-setup.sh"
 # which he used to install the red#matrix.
 #
 # The script uses another script from https://github.com/lukas2511/letsencrypt.sh
 #
-# The documentation of bash is here
+# The documentation for bash is here
 # https://www.gnu.org/software/bash/manual/bash.html
 #
 function check_sanity {
@@ -120,6 +120,15 @@ function check_sanity {
 
 function check_config {
     print_info "config check..."
+    # Check for required parameters
+    if [ -z "$db_pass" ]
+    then
+        die "db_pass not set in $configfile"
+    fi     
+    if [ -z "$le_domain" ]
+    then
+        die "le_domain not set in $configfile"
+    fi   
     # backup is important and should be checked
 	if [ -n "$backup_device_name" ]
 	then
@@ -225,6 +234,11 @@ function install_curl {
     nocheck_install "curl"
 }
 
+function install_sendmail {
+    print_info "installing sendmail..."
+    nocheck_install "sendmail"
+}
+
 function install_php {
     # openssl and mbstring are included in libapache2-mod-php5
     # to_to:  php5-suhosin
@@ -809,6 +823,7 @@ check_sanity
 # Read config file edited by user
 configfile=hubzilla-config.txt
 source $configfile
+
 selfhostdir=/etc/selfhost
 selfhostscript=selfhost-updater.sh
 hubzilladaily=hubzilla-daily.sh
@@ -823,6 +838,7 @@ sslconf=/etc/apache2/sites-available/default-ssl.conf
 check_config
 update_upgrade
 install_curl
+install_sendmail
 install_apache
 install_php
 install_mysql

mod/pubsites.php

@@ -18,7 +18,7 @@ function pubsites_content(&$a) {
 	$o .= '<div class="section-title-wrapper"><h2>' . t('Public Hubs') . '</h2></div>';
 
 	$o .= '<div class="section-content-tools-wrapper"><div class="descriptive-text">' . 
-		t('The listed hubs allow public registration for the $Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The hub <strong>may</strong> provide additional details.') . '</div>' . EOL;
+		t('The listed hubs allow public registration for the $Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details.') . '</div>' . EOL;
 
 	$ret = z_fetch_url($url);
 	if($ret['success']) {
@@ -37,9 +37,14 @@ function pubsites_content(&$a) {
 						$location = '<br />&nbsp;';
 						}
 					$urltext = str_replace(array('https://'), '', $jj['url']);
+					if($jj['project'] == 'redmatrix' || $jj['project'] == '' ) {
+						$o .= ''; 
+						}
+					else {
 					$o .= '<tr><td><a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" ><i class="icon-link"></i> ' . $urltext . '</a>' . $location . '</td><td>' . $jj['access'] . ' / ' . $jj['register'] . '</td><td>' . $jj['project'] . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="icon-eye-open"></i> ' . t('View') . '</a></td>' . $rate_links . '</tr>';
 					}
 				}
+			}
 	
 			$o .= '</table>';