From 5c54880ce89627ac932ae09fb85d57863b50d41c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 29 Jan 2014 20:38:32 +0000 Subject: Make Firefox behave if an attachment points to a file with a space in it. --- mod/attach.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mod') diff --git a/mod/attach.php b/mod/attach.php index c52966ce0..fd40791fe 100644 --- a/mod/attach.php +++ b/mod/attach.php @@ -25,7 +25,7 @@ function attach_init(&$a) { return; header('Content-type: ' . $r['data']['filetype']); - header('Content-disposition: attachment; filename=' . $r['data']['filename']); + header('Content-disposition: attachment; filename="' . $r['data']['filename']); if($r['data']['flags'] & ATTACH_FLAG_OS ) { $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $r['data']['data'],'rb'); $ostream = fopen('php://output','wb'); @@ -39,4 +39,4 @@ function attach_init(&$a) { echo $r['data']['data']; killme(); -} \ No newline at end of file +} -- cgit v1.2.3 From 5a5973982f6027e633917b1f0180432882dc9045 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 29 Jan 2014 22:11:36 +0000 Subject: Really fix attachments in Firefox --- mod/attach.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/attach.php b/mod/attach.php index fd40791fe..d0d3296e1 100644 --- a/mod/attach.php +++ b/mod/attach.php @@ -25,7 +25,7 @@ function attach_init(&$a) { return; header('Content-type: ' . $r['data']['filetype']); - header('Content-disposition: attachment; filename="' . $r['data']['filename']); + header('Content-disposition: attachment; filename="' . $r['data']['filename'] . '"'); if($r['data']['flags'] & ATTACH_FLAG_OS ) { $istream = fopen('store/' . $c[0]['channel_address'] . '/' . $r['data']['data'],'rb'); $ostream = fopen('php://output','wb'); -- cgit v1.2.3 From b8fb6a437335ce16e658f8acda632916bb28e574 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 29 Jan 2014 17:09:20 -0800 Subject: more chat infrastructure --- mod/chat.php | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 mod/chat.php (limited to 'mod') diff --git a/mod/chat.php b/mod/chat.php new file mode 100644 index 000000000..bc981b76b --- /dev/null +++ b/mod/chat.php @@ -0,0 +1,62 @@ + 1) + $which = argv(1); + if(! $which) { + if(local_user()) { + $channel = $a->get_channel(); + if($channel && $channel['channel_address']) + $which = $channel['channel_address']; + } + } + if(! $which) { + notice( t('You must be logged in to see this page.') . EOL ); + return; + } + + $profile = 0; + $channel = $a->get_channel(); + + if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + $profile = argv(1); + } + + $a->page['htmlhead'] .= '' . "\r\n" ; + + // Run profile_load() here to make sure the theme is set before + // we start loading content + + profile_load($a,$which,$profile); + +} + + +function chat_content(&$a) { + + if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'chat')) { + notice( t('Permission denied.') . EOL); + return; + } + + if((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) { + chatroom_leave(get_observer_hash(),$room_id,$_SERVER['REMOTE_ADDR']); + goaway(z_root() . '/channel/' . argv(1)); + } + + + if(argc() > 2 && intval(argv(2))) { + $room_id = intval(argv(2)); + $x = chatroom_enter(get_observer_hash(),$room_id,'online',$_SERVER['REMOTE_ADDR']); + if(! $x) + return; + $o = replace_macros(get_markup_template('chat.tpl'),array()); + return $o; + } + +} \ No newline at end of file -- cgit v1.2.3 From 0d326dfb45734950159030ea02b02dec4fba55b7 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 29 Jan 2014 18:02:51 -0800 Subject: mod/chatsvc - ajax backend for chat --- mod/chatsvc.php | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 mod/chatsvc.php (limited to 'mod') diff --git a/mod/chatsvc.php b/mod/chatsvc.php new file mode 100644 index 000000000..b8d2a9f69 --- /dev/null +++ b/mod/chatsvc.php @@ -0,0 +1,104 @@ + false); + + $a->data['chat']['room_id'] = intval($_REQUEST['room_id']); + $x = q("select cr_uid from chatroom where cr_id = %d and cr_id != 0 limit 1", + intval($a->data['chat']['room_id']) + ); + if(! $x) + json_return_and_die($ret); + + $a->data['chat']['uid'] = $x[0]['cr_uid']; + + if(! perm_is_allowed($a->data['chat']['uid'],get_observer_hash(),'chat')) { + json_return_and_die($ret); + } + +} + +function chatsvc_post(&$a) { + + $ret = array('success' => false); + + $room_id = $a->data['chat']['room_id']; + $text = escape_tags($_REQUEST['chat_text']); + + + $sql_extra = permissions_sql($a->data['chat']['uid']); + + $r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra", + intval($a->data['chat']['uid']), + intval($a->data['chat']['room_id']) + ); + if(! $r) + json_return_and_die($ret); + + $x = q("insert into chat ( chat_room, chat_xchan, created, chat_text ) + values( %d, '%s', '%s', '%s' )", + intval($a->data['chat']['room_id']), + dbesc(get_observer_hash()), + dbesc(datetime_convert()), + dbesc($text) + ); + +} + +function chatsvc_content(&$a) { + + $lastseen = intval($_REQUEST['last']); + + $ret = array('success' => false); + + $sql_extra = permissions_sql($a->data['chat']['uid']); + + $r = q("select * from chatroom where cr_uid = %d and cr_id = %d $sql_extra", + intval($a->data['chat']['uid']), + intval($a->data['chat']['room_id']) + ); + if(! $r) + json_return_and_die($ret); + + $inroom = array(); + + $r = q("select * from chatpresence left join xchan on xchan_hash = cp_xchan where cp_room = %d order by xchan_name", + intval($a->data['chat']['room_id']) + ); + if($r) { + foreach($r as $rr) { + $inroom[] = array('img' => zid($rr['xchan_photo_m']), 'img_type' => $rr['xchan_photo_mimetype'],'name' => $rr['xchan_name']); + } + } + + $chats = array(); + + $r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d", + intval($a->data['chat']['room_id']), + intval($lastseen) + ); + if($r) { + foreach($r as $rr) { + $chats[] = array( + 'id' => $rr['chat_id'], + 'img' => zid($rr['xchan_photo_m']), + 'img_type' => $rr['xchan_photo_mimetype'], + 'name' => $rr['xchan_name'], + 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'c'), + 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $rr['created'], 'r'), + 'text' => smilies(bbcode($rr['chat_text'])) + ); + } + } + + $ret['success'] = true; + $ret['inroom'] = $inroom; + $ret['chats'] = $chats; + + json_return_and_die($ret); + +} + \ No newline at end of file -- cgit v1.2.3 From c24aa824fe49d6dc803fb58c577d2238db416f2f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 29 Jan 2014 18:19:19 -0800 Subject: chat is a members only feature, there is no "guest" access. --- mod/chat.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'mod') diff --git a/mod/chat.php b/mod/chat.php index bc981b76b..42a7808d9 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -39,20 +39,26 @@ function chat_init(&$a) { function chat_content(&$a) { - if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'chat')) { + $observer = get_observer_hash(); + if(! $observer) { + notice( t('Permission denied.') . EOL); + return; + } + + if(! perm_is_allowed($a->profile['profile_uid'],$observer,'chat')) { notice( t('Permission denied.') . EOL); return; } if((argc() > 3) && intval(argv(2)) && (argv(3) === 'leave')) { - chatroom_leave(get_observer_hash(),$room_id,$_SERVER['REMOTE_ADDR']); + chatroom_leave($observer,$room_id,$_SERVER['REMOTE_ADDR']); goaway(z_root() . '/channel/' . argv(1)); } if(argc() > 2 && intval(argv(2))) { $room_id = intval(argv(2)); - $x = chatroom_enter(get_observer_hash(),$room_id,'online',$_SERVER['REMOTE_ADDR']); + $x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']); if(! $x) return; $o = replace_macros(get_markup_template('chat.tpl'),array()); -- cgit v1.2.3 From 9fdee53c9a35d584de8cacd071c6608de88a18b6 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 29 Jan 2014 20:14:18 -0800 Subject: start on the ajax bits --- mod/chat.php | 5 ++++- mod/chatsvc.php | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/chat.php b/mod/chat.php index 42a7808d9..b8af4c1a6 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -61,7 +61,10 @@ function chat_content(&$a) { $x = chatroom_enter($observer,$room_id,'online',$_SERVER['REMOTE_ADDR']); if(! $x) return; - $o = replace_macros(get_markup_template('chat.tpl'),array()); + $o = replace_macros(get_markup_template('chat.tpl'),array( + '$room_id' => $room_id, + '$submit' => t('Submit') + )); return $o; } diff --git a/mod/chatsvc.php b/mod/chatsvc.php index b8d2a9f69..23b95cd1c 100644 --- a/mod/chatsvc.php +++ b/mod/chatsvc.php @@ -4,6 +4,8 @@ require_once('include/security.php'); function chatsvc_init(&$a) { +//logger('chatsvc'); + $ret = array('success' => false); $a->data['chat']['room_id'] = intval($_REQUEST['room_id']); -- cgit v1.2.3 From 7b609782623d91c2bdf81c04cd801aaae927e9fa Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 29 Jan 2014 20:40:37 -0800 Subject: back-end for changing online status and keeping presence refreshed --- mod/chat.php | 3 +++ mod/chatsvc.php | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/chat.php b/mod/chat.php index b8af4c1a6..fa3d05364 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -67,5 +67,8 @@ function chat_content(&$a) { )); return $o; } + require_once('include/widgets.php'); + + return widget_chatroom_list(array()); } \ No newline at end of file diff --git a/mod/chatsvc.php b/mod/chatsvc.php index 23b95cd1c..39161b5a7 100644 --- a/mod/chatsvc.php +++ b/mod/chatsvc.php @@ -29,7 +29,19 @@ function chatsvc_post(&$a) { $room_id = $a->data['chat']['room_id']; $text = escape_tags($_REQUEST['chat_text']); - + $status = strip_tags($_REQUEST['status']); + + if($status && $room_id) { + $r = q("update chatpresence set cp_status = '%s', cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1", + dbesc($status), + dbesc(datetime_convert()), + intval($room_id), + dbesc(get_observer_hash()), + dbesc($_SERVER['REMOTE_ADDR']) + ); + } + if(! $text) + return; $sql_extra = permissions_sql($a->data['chat']['uid']); @@ -96,6 +108,13 @@ function chatsvc_content(&$a) { } } + $r = q("update chatpresence set cp_last = '%s' where cp_room = %d and cp_xchan = '%s' and cp_client = '%s' limit 1", + dbesc(datetime_convert()), + intval($room_id), + dbesc(get_observer_hash()), + dbesc($_SERVER['REMOTE_ADDR']) + ); + $ret['success'] = true; $ret['inroom'] = $inroom; $ret['chats'] = $chats; -- cgit v1.2.3 From 080928f214c9f83879f1578e05baa6032fa2b7b8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 29 Jan 2014 21:29:48 -0800 Subject: chatroom management front-end stuff --- mod/chat.php | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'mod') diff --git a/mod/chat.php b/mod/chat.php index fa3d05364..54fa58092 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -36,6 +36,46 @@ function chat_init(&$a) { } +function chat_post(&$a) { + + if($_POST['room_name']) + $room = strip_tags(trim($_POST['room_name'])); + + if((! $room) || (! local_user())) + return; + + $channel = $a->get_channel(); + + + if($_POST['action'] === 'drop') { + chatroom_destroy($channel,array('cr_name' => $room)); + goaway(z_root() . '/chat/' . $channel['channel_address']); + } + + + $arr = array('name' => $room); + $arr['allow_gid'] = perms2str($_REQUEST['group_allow']); + $arr['allow_cid'] = perms2str($_REQUEST['contact_allow']); + $arr['deny_gid'] = perms2str($_REQUEST['group_deny']); + $arr['deny_cid'] = perms2str($_REQUEST['contact_deny']); + + chatroom_create($channel,$arr); + + $x = q("select cr_id from chatroom where cr_name = '%s' and cr_uid = %d limit 1", + dbesc($room), + intval(local_user()) + ); + + if($x) + goaway(z_root() . '/chat/' . $channel['channel_address'] . '/' . $x[0]['cr_id']); + + // that failed. Try again perhaps? + + goaway(z_root() . '/chat/' . $channel['channel_address'] . '/new'); + + +} + function chat_content(&$a) { @@ -62,11 +102,44 @@ function chat_content(&$a) { if(! $x) return; $o = replace_macros(get_markup_template('chat.tpl'),array( + '$room_name' => '', // should we get this from the API? '$room_id' => $room_id, '$submit' => t('Submit') )); return $o; } + + + + + + if(local_user() && argc() > 2 && argv(2) === 'new') { + + + $channel = $a->get_channel(); + $channel_acl = array( + 'allow_cid' => $channel['channel_allow_cid'], + 'allow_gid' => $channel['channel_allow_gid'], + 'deny_cid' => $channel['channel_deny_cid'], + 'deny_gid' => $channel['channel_deny_gid'] + ); + + require_once('include/acl_selectors.php'); + + $o = replace_macros(get_markup_template('chatroom_new.tpl'),array( + '$header' => t('New Chatroom'), + '$name' => array('room_name',t('Chatroom Name'),'', ''), + '$acl' => populate_acl($channel_acl), + '$submit' => t('Submit') + )); + return $o; + } + + + + + + require_once('include/widgets.php'); return widget_chatroom_list(array()); -- cgit v1.2.3 From 6c6a9b963a925d33b2cc436d877a4edc5f0d59b1 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 30 Jan 2014 01:00:46 -0800 Subject: a bit more ajax work on chat and chatsvc and some fiddling with layouts --- mod/chatsvc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/chatsvc.php b/mod/chatsvc.php index 39161b5a7..d76a87462 100644 --- a/mod/chatsvc.php +++ b/mod/chatsvc.php @@ -59,7 +59,8 @@ function chatsvc_post(&$a) { dbesc(datetime_convert()), dbesc($text) ); - + $ret['success'] = true; + json_return_and_die($ret); } function chatsvc_content(&$a) { -- cgit v1.2.3