Merge remote-tracking branch 'friendika-master/master' into iconpopup

6 files changed, 33 insertions, 4 deletions

diff --git a/include/bbcode.php b/include/bbcode.php
index 4caf18766..44f571450 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -22,7 +22,7 @@ function bbcode($Text) {
 	// Perform URL Search
 
 
-	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
+	$Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+\,]+)/", ' <a href="$2" target="external-link">$2</a>', $Text);
 
 	$Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text);
 	$Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text);
diff --git a/include/group.php b/include/group.php
index 793e854be..07cd45f19 100644
--- a/include/group.php
+++ b/include/group.php
@@ -110,7 +110,7 @@ function group_get_members($gid) {
 			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
 			WHERE `gid` = %d AND `group_member`.`uid` = %d",
 			intval($gid),
-			intval($_SESSION['uid'])
+			intval(local_user())
 		);
 		if(count($r))
 			$ret = $r;
@@ -118,6 +118,21 @@ function group_get_members($gid) {
 	return $ret;
 }
 
+function group_public_members($gid) {
+	$ret = 0;
+	if(intval($gid)) {
+		$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member` 
+			LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
+			WHERE `gid` = %d AND `group_member`.`uid` = %d AND `contact`.`network` != 'dfrn' ",
+			intval($gid),
+			intval(local_user())
+		);		
+		if(count($r))
+			$ret = count($r);
+	}
+	return $ret;
+}
+
 
 
 function group_side($every="contacts",$each="group") {
diff --git a/include/items.php b/include/items.php
index 4a740e55b..58fad9927 100644
--- a/include/items.php
+++ b/include/items.php
@@ -762,7 +762,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 	if(! $rino_enable)
 		$rino = 0;
 
-	$url = $contact['notify'] . '?f=&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
+	$url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : '');
 
 	logger('dfrn_deliver: ' . $url);
 
diff --git a/include/main.js b/include/main.js
index 750cce74c..18e884b31 100644
--- a/include/main.js
+++ b/include/main.js
@@ -26,6 +26,7 @@
 	var pr = 0;
 	var liking = 0;
 	var in_progress = false;
+	var langSelect = false;
 
 	$(document).ready(function() {
 		$.ajaxSetup({cache: false});
@@ -45,6 +46,18 @@
 					$('#pause').html('');
 				}
 			}
+			// F8 - show/hide language selector
+			if(event.keyCode == '119') {
+				if(langSelect) {
+					langSelect = false;
+					$('#language-selector').hide();
+				}
+				else {
+					langSelect = true;
+					$('#language-selector').show();
+				}
+			}		
+
 // this is shift-home on FF, but $ on IE, disabling until I figure out why the diff.
 // update: incompatible usage of onKeyDown vs onKeyPress
 //			if(event.keyCode == '36' && event.shiftKey == true) {
diff --git a/include/nav.php b/include/nav.php
index db3b909af..b8b65f84d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -16,6 +16,7 @@ function nav(&$a) {
 	 */
 
 	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+	$a->page['nav'] .= lang_selector();
 
 	/**
 	 *
diff --git a/include/poller.php b/include/poller.php
index 98c55a2a9..8619697d9 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -167,7 +167,7 @@ function poller_run($argv, $argc){
 				if(intval($contact['duplex']) && $contact['issued-id'])
 					$idtosend = '1:' . $orig_id;		
 
-				$url = $contact['poll'] . '?f=&dfrn_id=' . $idtosend 
+				$url = $contact['poll'] . '?dfrn_id=' . $idtosend 
 					. '&dfrn_version=' . DFRN_PROTOCOL_VERSION 
 					. '&type=data&last_update=' . $last_update ;