';
- $output .= '
'. theme('username', user_load(array('uid' => $comment->uid))) .'
';
+ $owner = user_load(array('uid' => $comment->uid));
+ $output .= '
'. theme('user_picture', $owner).theme('username', $owner) .'
';
$comment_text = _facebook_status_run_filter($comment->comment);
$comment_text = nl2br($comment_text);
$output .= '
'. $comment_text .'
';
$output .= '
';
$output .= '
'. theme('facebook_status_time', $comment->comment_time) .'';
- $q = $_GET['q'];
- if ($destination) {
- $q = $destination;
- }
- elseif (strpos($q, 'fbssc/js') !== FALSE) {
- $q = '
';
- }
- if (fbssc_can_edit($comment)) {
- $output .= ''.
- l(t('Edit'), 'statuses/comment/'. $comment->cid .'/edit', array('query' => array('destination' => $q)))
- .'';
- }
- if (fbssc_can_delete($comment)) {
- $output .= ''.
- l(t('Delete'), 'statuses/comment/'. $comment->cid .'/delete', array('query' => array('destination' => $q)))
- .'';
- }
+
+ if (module_exists("popups")) {
+ if (fbssc_can_edit($comment)) {
+ $output .= "";
+ }
+ if (fbssc_can_delete($comment)) {
+ $output .= "";
+ }
+ } else {
+ $q = $_GET['q'];
+ if ($destination) {
+ $q = $destination;
+ }
+ elseif (strpos($q, 'fbssc/js') !== FALSE) {
+ $q = '';
+ }
+ if (fbssc_can_edit($comment)) {
+ $output .= ''.
+ l(t('Edit'), 'statuses/comment/'. $comment->cid .'/edit', array('query' => array('destination' => $q)))
+ .'';
+ }
+ if (fbssc_can_delete($comment)) {
+ $output .= ''.
+ l(t('Delete'), 'statuses/comment/'. $comment->cid .'/delete', array('query' => array('destination' => $q)))
+ .'';
+ }
+ }
+ $output .= '';
$output .= '';
if ($count > 3 && $delay_load) {
- $options = array('attributes' => array('class' => 'fbssc_show_comments_link fbssc_show_comments', 'id' => 'fbssc_toggle_'. $comments[0]->sid));
+ $options = array('attributes' => array('class' => 'fbssc_show_comments_link fbssc_show_comments', 'id' => 'fbssc_comment_toggle_'. $comments[0]->sid));
if ($count > 9) {
$options['attributes']['class'] = 'fbssc_show_comments_link';
}
@@ -253,19 +294,18 @@ function theme_fbssc_items($comments, $d
* @return
* Themed HTML for the status form.
*/
-function theme_fbssc_form_display($sid, $delay_load_form = TRUE, $delay_load_comments = TRUE) {
- if (fbssc_can_post(facebook_status_load($sid))) {
+function theme_fbssc_form_display($sid, $delay_load_form = TRUE, $delay_load_comments = TRUE, $form = NULL) {
+ global $user;
+ if (fbssc_can_post(facebook_status_load($sid)) || user_access('view all status comments', $user)) {
$path = drupal_get_path('module', 'fbssc');
drupal_add_js($path .'/fbssc.js');
- $output = '';
- if ($delay_load_form && !fbssc_count_comments($sid)) {
- $output = '';
- return $output .'
'. drupal_get_form('fbssc_box', $sid, $delay_load_comments) .'
';
+ if($form) {
+ $output .= drupal_render($form);
+ } else {
+ $output .= drupal_get_form('fbssc_box', $sid, $delay_load_comments);
}
- return '
'. drupal_get_form('fbssc_box', $sid, $delay_load_comments) .'
';
}
+ return $output;
}
//==============
@@ -496,6 +536,7 @@ function _fbssc_get_thread_author($sid)
* will not be used.
*/
function fbssc_box($form_state, $sid, $delay_load = TRUE) {
+ static $boxes_count = 0;
$path = drupal_get_path('module', 'fbssc');
drupal_add_css($path .'/fbssc.css');
$form = array();
@@ -506,32 +547,47 @@ function fbssc_box($form_state, $sid, $d
$form['#qu'] = $form_state['fbssc']['q'];
}
$comments = fbssc_get_comments($sid);
- $form['before'] = array('#value' => '
');
- $form['comments'] = array('#value' => theme('fbssc_items', $comments, $delay_load, $form['#qu']));
- if (count($comments)) {
- $form['start-hide'] = array('#value' => '
');
- }
- $form['status-comment'] = array(
- '#type' => 'textarea',
- '#rows' => 1,
- '#required' => TRUE,
- );
- $form['save'] = array(
- '#type' => 'submit',
- '#value' => t('Comment'),
- '#ahah' => array(
- 'path' => 'fbssc/js/refresh',
- 'wrapper' => 'fbssc_replace_'. $sid,
- 'effect' => 'fade',
- 'method' => 'replace',
- ),
+ $form['replace-start'] = array(
+ '#value' => '
'
);
- if (count($comments)) {
- $form['end-hide'] = array('#value' => '
');
+ if (user_access('post status comment', $GLOBALS['user'])) {
+ $overlap = count($comments) > 3 ? 'fbssc_overlap' : '';
+ $form['start-hide'] = array(
+ '#value' => ''
+ );
+ $form['comments'] = array(
+ '#value' => theme('fbssc_items', $comments, $delay_load, $form['#qu']),
+ );
+ $form['status-comment'] = array(
+ '#type' => 'textarea',
+ '#rows' => 1,
+ '#required' => TRUE,
+ '#prefix' => '
'
+ );
+ $form['save'] = array(
+ '#id' => 'save-'.(++$boxes_count),
+ '#type' => 'submit',
+ '#value' => t('Comment'),
+ '#ahah' => array(
+ 'path' => 'fbssc/js/refresh',
+ 'wrapper' => 'fbssc_replace_'. $sid,
+ 'effect' => 'fade',
+ 'method' => 'replace',
+ ),
+ '#suffix' => '
'
+ );
+ } else {
+ // Only show comment list
+ $form['comments'] = array(
+ '#value' => theme('fbssc_items', $comments, $delay_load, $form['#qu']),
+ );
}
- $form['after'] = array('#value' => '
');
+ $form['replace-end'] = array(
+ '#value' => '
'
+ );
+
$form['#sid'] = $sid;
if ($form_state['fbssc']['sid']) {
$form['#sid'] = $form_state['fbssc']['sid'];
@@ -566,16 +622,48 @@ function fbssc_save_js() {
'Someone tried to access the JavaScript processing page for Facebook-style Statuses Comments directly.', array(), WATCHDOG_DEBUG);
return;
}
+
+ $sid = $form['#sid'];
+ $comments = fbssc_get_comments($sid);
+
$form_id = array_shift($args);
drupal_process_form($form_id, $form, $form_state);
$form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id);
- //Get HTML for the replacement form. Only these elements will be AHAH-refreshed.
+ // Get HTML for the replacement form. Only these elements will be AHAH-refreshed.
$new_form['comments'] = $form['comments'];
+ $new_form['start-hide'] = $form['start-hide'];
$new_form['status-comment'] = $form['status-comment'];
$new_form['save'] = $form['save'];
- $output = theme('status_messages') . drupal_render($new_form);
+
+ $output = theme('status_messages');
+ if(count($comments) == 0) {
+ $javascript = array();
+ form_set_error(NULL, '', TRUE);
+ } else {
+ // Retrieve the new settings
+ $javascript = drupal_add_js(NULL, NULL, 'header');
+ }
+ $output .= theme('fbssc_form_display', $sid, TRUE, TRUE, $new_form);
//Return the results.
- drupal_json(array('status' => TRUE, 'data' => $output));
+ if(!empty($javascript)) {
+ drupal_json(array('status' => TRUE, 'data' => $output, 'settings' => call_user_func_array('array_merge_recursive', $javascript['setting']),));
+ } else {
+ // This case updating settings is avoided, so ahah behavior is not broken
+ drupal_json(array('status' => TRUE, 'data' => $output));
+ }
+}
+
+/**
+ * Update status comments via AJAX.
+ */
+function fbssc_update_js($sid) {
+ $content = "
+
+
+ ";
+ return $content;
}
//=============