From 402d44e2f4a7db97236d1999076ef57b69cec4b9 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 27 Feb 2014 16:01:44 -0800 Subject: fix photos in private mail --- include/message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/message.php b/include/message.php index a95021583..607166ec9 100644 --- a/include/message.php +++ b/include/message.php @@ -76,7 +76,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' $match = null; $images = null; - if(preg_match_all("/\[img\](.*?)\[\/img\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) + if(preg_match_all("/\[zmg\](.*?)\[\/zmg\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match)) $images = $match[1]; $match = false; -- cgit v1.2.3 From 642da17b86cce8f6455a68d2d863a288d3c125c8 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 27 Feb 2014 17:07:11 -0800 Subject: chatroom suggestions --- include/widgets.php | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'include') diff --git a/include/widgets.php b/include/widgets.php index 4a5ae9de7..eb4565641 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -589,3 +589,39 @@ function widget_chatroom_list($arr) { )); } +function widget_bookmarkedchats($arr) { + $h = get_observer_hash(); + if(! $h) + return; + $r = q("select * from xchat where xchat_xchan = '%s' group by xchat_url order by xchat_desc", + dbesc($h) + ); + + for($x = 0; $x < count($r); $x ++) + $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); + return replace_macros(get_markup_template('bookmarkedchats.tpl'),array( + '$header' => t('Bookmarked Chatrooms'), + '$rooms' => $r + )); +} + +function widget_suggestedchats($arr) { + + // probably should restrict this to your friends, but then the widget will only work + // if you are logged in locally. + + $h = get_observer_hash(); + if(! $h) + return; + $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc", + dbesc($h) + ); + + for($x = 0; $x < count($r); $x ++) + $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); + return replace_macros(get_markup_template('bookmarkedchats.tpl'),array( + '$header' => t('Suggested Chatrooms'), + '$rooms' => $r + )); +} + -- cgit v1.2.3 From d2bc7c606a6585dc82127717acf2cfe60b45f987 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 27 Feb 2014 17:10:26 -0800 Subject: minor fixes to suggested chatrooms --- include/widgets.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include') diff --git a/include/widgets.php b/include/widgets.php index eb4565641..aaf5a72a0 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -613,9 +613,7 @@ function widget_suggestedchats($arr) { $h = get_observer_hash(); if(! $h) return; - $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc", - dbesc($h) - ); + $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc"); for($x = 0; $x < count($r); $x ++) $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); -- cgit v1.2.3 From 102521844b3d6f31d0d801b0d0c89241c2c621af Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 27 Feb 2014 20:48:10 -0800 Subject: put schemas in Comanche (this requires theme support (!)) --- include/comanche.php | 7 +++++++ include/widgets.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/comanche.php b/include/comanche.php index f02190ee5..0c81b0ed3 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -57,6 +57,13 @@ function comanche_parser(&$a,$s) { if($cnt) $a->page['template'] = trim($matches[1]); + + $cnt = preg_match("/\[theme=(.*?)\](.*?)\[\/theme\]/ism", $s, $matches); + if($cnt) { + $a->layout['schema'] = trim($matches[1]); + $a->layout['theme'] = trim($matches[2]); + } + $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches); if($cnt) $a->layout['theme'] = trim($matches[1]); diff --git a/include/widgets.php b/include/widgets.php index aaf5a72a0..8d5ab77e3 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -613,7 +613,7 @@ function widget_suggestedchats($arr) { $h = get_observer_hash(); if(! $h) return; - $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc"); + $r = q("select *, count(xchat_url) as total from xchat group by xchat_url order by total desc, xchat_desc limit 24"); for($x = 0; $x < count($r); $x ++) $r[$x]['xchat_url'] = zid($r[$x]['xchat_url']); -- cgit v1.2.3