Merge remote-tracking branch 'upstream/develop' into 1511-ostatus-bookmark-design

include/bb2diaspora.php

@@ -83,7 +83,6 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 		'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
 	), $Text);
 
-
 	// Converting images with size parameters to simple images. Markdown doesn't know it.
 	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
 
@@ -94,11 +93,12 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 		// Add all tags that maybe were removed
 		if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",$OriginalText, $tags)) {
 			$tagline = "";
-			foreach($tags[2] as $tag)
-				if (!strpos($Text, "#".$tag))
+			foreach($tags[2] as $tag) {
+				$tag = html_entity_decode($tag, ENT_QUOTES, 'UTF-8');
+				if (!strpos(html_entity_decode($Text, ENT_QUOTES, 'UTF-8'), "#".$tag))
 					$tagline .= "#".$tag." ";
-
-			$Text = $Text."<br />".$tagline;
+			}
+			$Text = $Text." ".$tagline;
 		}
 
 	} else

include/forums.php

@@ -60,10 +60,12 @@ function get_forumlist($uid, $showhidden = true, $lastitem, $showprivate = false
  * Sidebar widget to show subcribed friendica forums. If activated
  * in the settings, it appears at the notwork page sidebar
  *
- * @param App $a
+ * @param int $uid
+ * @param int $cid
+ *	The contact id which is used to mark a forum as "selected"
  * @return string
  */
-function widget_forumlist($a) {
+function widget_forumlist($uid,$cid = 0) {
 
 	if(! intval(feature_enabled(local_user(),'forumlist_widget')))
 		return;
@@ -73,7 +75,7 @@ function widget_forumlist($a) {
 	//sort by last updated item
 	$lastitem = true;
 
-	$contacts = get_forumlist($a->user['uid'],true,$lastitem, true);
+	$contacts = get_forumlist($uid,true,$lastitem, true);
 	$total = count($contacts);
 	$visible_forums = 10;
 
@@ -83,11 +85,14 @@ function widget_forumlist($a) {
 
 		foreach($contacts as $contact) {
 
+			$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
+
 			$entry = array(
-				'url' => $a->get_baseurl() . '/network?f=&cid=' . $contact['id'],
-				'external_url' => $a->get_baseurl() . '/redir/' . $contact['id'],
+				'url' => z_root() . '/network?f=&cid=' . $contact['id'],
+				'external_url' => z_root() . '/redir/' . $contact['id'],
 				'name' => $contact['name'],
 				'cid' => $contact['id'],
+				'selected' 	=> $selected,
 				'micro' => proxy_url($contact['micro'], false, PROXY_SIZE_MICRO),
 				'id' => ++$id,
 			);

include/group.php

@@ -213,9 +213,20 @@ function mini_group_select($uid,$gid = 0) {
 }
 
 
-
-
-function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
+/**
+ * @brief Create group sidebar widget
+ * 
+ * @param string $every
+ * @param string $each
+ * @param string $editmode
+ *	'standard' => include link 'Edit groups'
+ *	'extended' => include link 'Create new group'
+ *	'full' => include link 'Create new group' and provide for each group a link to edit this group
+ * @param int $group_id
+ * @param int $cid
+ * @return string
+ */
+function group_side($every="contacts",$each="group",$editmode = "standard", $group_id = 0, $cid = 0) {
 
 	$o = '';
 
@@ -239,13 +250,13 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 	$member_of = array();
 	if($cid) {
 		$member_of = groups_containing(local_user(),$cid);
-	} 
+	}
 
 	if(count($r)) {
 		foreach($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 			
-			if ($edit) {
+			if ($editmode == "full") {
 				$groupedit = array(
 					'href' => "group/".$rr['id'],
 					'title' => t('edit'),
@@ -269,14 +280,17 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
 
 	$tpl = get_markup_template("group_side.tpl");
 	$o = replace_macros($tpl, array(
-		'$title'		=> t('Groups'),
+		'$title'	=> t('Groups'),
+		'newgroup'	=> (($editmode == "extended") || ($editmode == "full") ? 1 : ''),
+		'$editgroupstext' => t('Edit groups'),
+		'grouppage'	=> "group/",
 		'$edittext'     => t('Edit group'),
 		'$createtext' 	=> t('Create a new group'),
-    '$creategroup' => t('Group Name: '),
-    '$form_security_token' => get_form_security_token("group_edit"),
+		'$creategroup'  => t('Group Name: '),
+		'$form_security_token' => get_form_security_token("group_edit"),
 		'$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
-		'$groups'		=> $groups,
-		'$add'			=> t('add'),
+		'$groups'	=> $groups,
+		'$add'		=> t('add'),
 	));
 
 

include/identity.php

@@ -216,7 +216,12 @@ if(! function_exists('profile_sidebar')) {
 		}
 
 		if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
-				$connect = false;
+			$connect = false;
+
+		if ($connect)
+			$subscribe_feed = t("Atom feed");
+		else
+			$subscribe_feed = false;
 
 		if (isset($profile['remoteconnect']))
 			$remoteconnect = $profile['remoteconnect'];
@@ -337,6 +342,7 @@ if(! function_exists('profile_sidebar')) {
 			'$profile' => $p,
 			'$connect'  => $connect,
 			'$remoteconnect'  => $remoteconnect,
+			'$subscribe_feed' => $subscribe_feed,
 			'$wallmessage' => $wallmessage,
 			'$location' => $location,
 			'$gender'   => $gender,