Subversion Repositories group.jisko

Compare Revisions

Ignore whitespace Rev 296 → Rev 297

/trunk/includes/functions.php
691,28 → 691,28
}
if ($note['type'] == 'twitter' || ($note['type'] == 'twitter_reply')) $XMLWriter->writeElement('id', $serial['twitid']);
else $XMLWriter->writeElement('id', $noteArray['ID']);
$XMLWriter->writeElement('created_at', date('D M j G:i:s O Y', $noteArray['timestamp']));
$XMLWriter->writeElement('text', stripslashes($text));
if ($type == 'direct_messages' || ($type == 'direct_message')) {
$XMLWriter->writeElement('sender_id', $noteArray['user_id']);
$XMLWriter->writeElement('recipient_id', $noteArray['reply_user']);
$XMLWriter->writeElement('sender_screen_name', $noteArray['username']);
$XMLWriter->writeElement('recipient_screen_name', $db->getUsernameFromID($noteArray['reply_user']));
} elseif ($type == 'notes' || ($type == 'notes+t' || ($type == 'notess'))) {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('source', $noteArray['from']);
if ($type == 'notes+t') {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('type', 'note');
else $XMLWriter->writeElement('type', $note['type']);
}
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) {
$XMLWriter->writeElement('truncated', 'false');
$XMLWriter->writeElement('in_reply_to_status_id', ($noteArray['replying'] ? $noteArray['replying'] : null));
$XMLWriter->writeElement('in_reply_to_user_id', ($noteArray['replying'] ? $noteArray['reply_user'][0] : null));
$XMLWriter->writeElement('favorited', ($db->checkFavorite($_USER['ID'], $noteArray['ID']) ? 'true' : 'false'));
$XMLWriter->writeElement('in_reply_to_screen_name', ($noteArray['replying'] ? $db->getUsernameFromID($noteArray['reply_user']) : null));
}
else $XMLWriter->writeElement('id', $noteArray['ID']);
$XMLWriter->writeElement('created_at', date('D M j G:i:s O Y', $noteArray['timestamp']));
$XMLWriter->writeElement('text', stripslashes($text));
if ($type == 'direct_messages' || ($type == 'direct_message')) {
$XMLWriter->writeElement('sender_id', $noteArray['user_id']);
$XMLWriter->writeElement('recipient_id', $noteArray['reply_user']);
$XMLWriter->writeElement('sender_screen_name', $noteArray['username']);
$XMLWriter->writeElement('recipient_screen_name', $db->getUsernameFromID($noteArray['reply_user']));
} elseif ($type == 'notes' || ($type == 'notes+t' || ($type == 'notess'))) {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('source', $noteArray['from']);
if ($type == 'notes+t') {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('type', 'note');
else $XMLWriter->writeElement('type', $note['type']);
}
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) {
$XMLWriter->writeElement('truncated', 'false');
$XMLWriter->writeElement('in_reply_to_status_id', ($noteArray['replying'] ? $noteArray['replying'] : null));
$XMLWriter->writeElement('in_reply_to_user_id', ($noteArray['replying'] ? $noteArray['reply_user'][0] : null));
$XMLWriter->writeElement('favorited', ($db->checkFavorite($_USER['ID'], $noteArray['ID']) ? 'true' : 'false'));
$XMLWriter->writeElement('in_reply_to_screen_name', ($noteArray['replying'] ? $db->getUsernameFromID($noteArray['reply_user']) : null));
}
}
}
else {
if ($type == 'relationship') $id_to_check = array('target'=>$result[0][1], 'source'=>$result[0][0]);
734,10 → 734,10
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply' && ($type != 'relationship'))) {
if ($type == 'direct_message' || ($type == 'direct_messages')) $XMLWriter->writeElement('id', $userto);
else $XMLWriter->writeElement('id', $profile['ID']);
$XMLWriter->writeElement('name', ($profile['realname'] ? $profile['realname'] : $profile['username']));
$XMLWriter->writeElement('name', ($profile['realname'] ? str_replace('<', '&lt;', str_replace('>', '&gt;', $profile['realname'])) : $profile['username']));
$XMLWriter->writeElement('screen_name', $profile['username']);
$XMLWriter->writeElement('location', ($profile['location'] ? $profile['location'] : null));
$XMLWriter->writeElement('description', ($profile['profile']['bio'] ? $profile['profile']['bio'] : null));
$XMLWriter->writeElement('location', ($profile['location'] ? str_replace('<', '&lt;', str_replace('>', '&gt;', $profile['location'])) : null));
$XMLWriter->writeElement('description', ($profile['profile']['bio'] ? str_replace('<', '&lt;', str_replace('>', '&gt;', $profile['profile']['bio'])) : null));
$XMLWriter->writeElement('profile_image_url', $avatar);
$XMLWriter->writeElement('url', ($profile['profile']['url'] ? $profile['profile']['url'] : null));
$XMLWriter->writeElement('protected', (($profile['privacy']['show_notes'] < 3) ? 'true' : 'false'));
/branches/3.0/includes/functions.php
691,28 → 691,28
}
if ($note['type'] == 'twitter' || ($note['type'] == 'twitter_reply')) $XMLWriter->writeElement('id', $serial['twitid']);
else $XMLWriter->writeElement('id', $noteArray['ID']);
$XMLWriter->writeElement('created_at', date('D M j G:i:s O Y', $noteArray['timestamp']));
$XMLWriter->writeElement('text', stripslashes($text));
if ($type == 'direct_messages' || ($type == 'direct_message')) {
$XMLWriter->writeElement('sender_id', $noteArray['user_id']);
$XMLWriter->writeElement('recipient_id', $noteArray['reply_user']);
$XMLWriter->writeElement('sender_screen_name', $noteArray['username']);
$XMLWriter->writeElement('recipient_screen_name', $db->getUsernameFromID($noteArray['reply_user']));
} elseif ($type == 'notes' || ($type == 'notes+t' || ($type == 'notess'))) {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('source', $noteArray['from']);
if ($type == 'notes+t') {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('type', 'note');
else $XMLWriter->writeElement('type', $note['type']);
}
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) {
$XMLWriter->writeElement('truncated', 'false');
$XMLWriter->writeElement('in_reply_to_status_id', ($noteArray['replying'] ? $noteArray['replying'] : null));
$XMLWriter->writeElement('in_reply_to_user_id', ($noteArray['replying'] ? $noteArray['reply_user'][0] : null));
$XMLWriter->writeElement('favorited', ($db->checkFavorite($_USER['ID'], $noteArray['ID']) ? 'true' : 'false'));
$XMLWriter->writeElement('in_reply_to_screen_name', ($noteArray['replying'] ? $db->getUsernameFromID($noteArray['reply_user']) : null));
}
else $XMLWriter->writeElement('id', $noteArray['ID']);
$XMLWriter->writeElement('created_at', date('D M j G:i:s O Y', $noteArray['timestamp']));
$XMLWriter->writeElement('text', stripslashes($text));
if ($type == 'direct_messages' || ($type == 'direct_message')) {
$XMLWriter->writeElement('sender_id', $noteArray['user_id']);
$XMLWriter->writeElement('recipient_id', $noteArray['reply_user']);
$XMLWriter->writeElement('sender_screen_name', $noteArray['username']);
$XMLWriter->writeElement('recipient_screen_name', $db->getUsernameFromID($noteArray['reply_user']));
} elseif ($type == 'notes' || ($type == 'notes+t' || ($type == 'notess'))) {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('source', $noteArray['from']);
if ($type == 'notes+t') {
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) $XMLWriter->writeElement('type', 'note');
else $XMLWriter->writeElement('type', $note['type']);
}
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply')) {
$XMLWriter->writeElement('truncated', 'false');
$XMLWriter->writeElement('in_reply_to_status_id', ($noteArray['replying'] ? $noteArray['replying'] : null));
$XMLWriter->writeElement('in_reply_to_user_id', ($noteArray['replying'] ? $noteArray['reply_user'][0] : null));
$XMLWriter->writeElement('favorited', ($db->checkFavorite($_USER['ID'], $noteArray['ID']) ? 'true' : 'false'));
$XMLWriter->writeElement('in_reply_to_screen_name', ($noteArray['replying'] ? $db->getUsernameFromID($noteArray['reply_user']) : null));
}
}
}
else {
if ($type == 'relationship') $id_to_check = array('target'=>$result[0][1], 'source'=>$result[0][0]);
734,10 → 734,10
if ($note['type'] != 'twitter' && ($note['type'] != 'twitter_reply' && ($type != 'relationship'))) {
if ($type == 'direct_message' || ($type == 'direct_messages')) $XMLWriter->writeElement('id', $userto);
else $XMLWriter->writeElement('id', $profile['ID']);
$XMLWriter->writeElement('name', ($profile['realname'] ? $profile['realname'] : $profile['username']));
$XMLWriter->writeElement('name', ($profile['realname'] ? str_replace('<', '&lt;', str_replace('>', '&gt;', $profile['realname'])) : $profile['username']));
$XMLWriter->writeElement('screen_name', $profile['username']);
$XMLWriter->writeElement('location', ($profile['location'] ? $profile['location'] : null));
$XMLWriter->writeElement('description', ($profile['profile']['bio'] ? $profile['profile']['bio'] : null));
$XMLWriter->writeElement('location', ($profile['location'] ? str_replace('<', '&lt;', str_replace('>', '&gt;', $profile['location'])) : null));
$XMLWriter->writeElement('description', ($profile['profile']['bio'] ? str_replace('<', '&lt;', str_replace('>', '&gt;', $profile['profile']['bio'])) : null));
$XMLWriter->writeElement('profile_image_url', $avatar);
$XMLWriter->writeElement('url', ($profile['profile']['url'] ? $profile['profile']['url'] : null));
$XMLWriter->writeElement('protected', (($profile['privacy']['show_notes'] < 3) ? 'true' : 'false'));