Merge remote-tracking branch 'upstream/master'

7 files changed, 17 insertions, 13 deletions

diff --git a/boot.php b/boot.php
index 2b1f3cb4e..48d81ff59 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/AccessList.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
-define ( 'STD_VERSION',             '0.11.1' );
+define ( 'STD_VERSION',             '1.0' );
 define ( 'ZOT_REVISION',            1     );
 
 define ( 'DB_UPDATE_VERSION',       1160  );
@@ -84,8 +84,8 @@ $DIRECTORY_FALLBACK_SERVERS = array(
 	'https://hubzilla.site',
 	'https://red.zottel.red',
 	'https://gravizot.de',
-	'https://blablanet.com',
-	'https://my.federated.social'
+	'https://my.federated.social',
+	'https://hubzilla.nl'
 );
 
 
diff --git a/include/network.php b/include/network.php
index e906fc7cb..f386afc8e 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1764,12 +1764,14 @@ function get_site_info() {
 	$site_name = get_config('system','sitename');
 	if(! get_config('system','hidden_version_siteinfo')) {
 		$version = RED_VERSION;
+		$tag = get_std_version();
+
 		if(@is_dir('.git') && function_exists('shell_exec')) {
 			$commit = trim( @shell_exec('git log -1 --format="%h"'));
-			if(! get_config('system','hidden_tag_siteinfo'))
-				$tag = trim( @shell_exec('git describe --tags --abbrev=0'));
-			else 
-				$tag = '';
+//			if(! get_config('system','hidden_tag_siteinfo'))
+//				$tag = trim( @shell_exec('git describe --tags --abbrev=0'));
+//			else 
+//				$tag = '';
 		}
 		if(! isset($commit) || strlen($commit) > 16)
 			$commit = '';
diff --git a/include/widgets.php b/include/widgets.php
index d4f3d32e1..89836f90c 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1148,7 +1148,7 @@ function widget_forums($arr) {
 		foreach($r1 as $rr) {
 			if($unseen && (! intval($rr['unseen'])))
 				continue;
-			$o .= '<li><span class="pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>';
+			$o .= '<li><a href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge pull-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img src="' . $rr['xchan_photo_s'] . '" style="width: 16px; height: 16px;" /> ' . $rr['xchan_name'] . '</a></li>';
 		}
 		$o .= '</ul></div>';
 	}
diff --git a/mod/invite.php b/mod/invite.php
index bda808142..1af5fc1f8 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -51,7 +51,7 @@ function invite_post(&$a) {
 		}
 		
 		if($invonly && ($x || is_site_admin())) {
-			$code = autoname(8) . srand(1000,9999);
+			$code = autoname(8) . rand(1000,9999);
 			$nmessage = str_replace('$invite_code',$code,$message);
 
 			$r = q("INSERT INTO `register` (`hash`,`created`) VALUES ('%s', '%s') ",
diff --git a/mod/siteinfo.php b/mod/siteinfo.php
index 4c5782abe..52d014de1 100644
--- a/mod/siteinfo.php
+++ b/mod/siteinfo.php
@@ -1,8 +1,6 @@
 <?php
 
 function siteinfo_init(&$a) {
-
-	
 	if (argv(1) ===  'json') {
 		$data = get_site_info();
 		json_return_and_die($data);
@@ -17,7 +15,7 @@ function siteinfo_content(&$a) {
 		$version = sprintf( t('Version %s'), RED_VERSION );
 		if(@is_dir('.git') && function_exists('shell_exec')) {
 			$commit = @shell_exec('git log -1 --format="%h"');
-			$tag = @shell_exec('git describe --tags --abbrev=0');
+			$tag = get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
 		}
 		if(! isset($commit) || strlen($commit) > 16)
 			$commit = '';
diff --git a/version.inc b/version.inc
index 71564ad0d..8282941e1 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-02.1234
+2015-12-03.1235
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 1346eecd5..843d1274c 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -25,6 +25,10 @@
 	margin: 15px;
 }
 
+#prvmail-text {
+  height: 20.0em;
+}
+
 .mail-conv-outside-wrapper {
 	margin-bottom: 20px;
 }