atom auto-discover, fix image preloading in ajax

pull/1/head
Mike Macgirvin 2010-08-10 16:54:36 -07:00
parent 04e65823d7
commit 06bdf8a4cf
5 changed files with 31 additions and 5 deletions

View File

@ -112,9 +112,8 @@ function photo_init(&$a) {
} }
header("Content-type: image/jpeg"); header("Content-type: image/jpeg");
header('Expires: ' . datetime_convert('UTC','UTC', 'now + 30 minutes', 'D, d M Y H:i:s' . ' GMT')); header('Expires: ' . datetime_convert('UTC','UTC', 'now + 3 months', 'D, d M Y H:i:s' . ' GMT'));
header('Expires: ' . datetime_convert('UTC','UTC', 'now + 30 minutes', 'D, d M Y H:i:s' . ' GMT')); // header("Cache-Control: max-age=36000, only-if-cached");
header("Cache-Control: max-age=3600, must-revalidate");
echo $data; echo $data;
killme(); killme();
return; //NOTREACHED return; //NOTREACHED

View File

@ -63,6 +63,8 @@ function profile_init(&$a) {
$profile = $a->argv[1]; $profile = $a->argv[1];
} }
profile_load($a,$which,$profile); profile_load($a,$which,$profile);
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/dfrn_poll/' . $which .'" />';
$a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n"; $a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
$dfrn_pages = array('request', 'confirm', 'notify', 'poll'); $dfrn_pages = array('request', 'confirm', 'notify', 'poll');

View File

@ -1,5 +1,6 @@
<?php <?php
// See update_profile.php for documentation
require_once('mod/network.php'); require_once('mod/network.php');
@ -9,7 +10,14 @@ function update_network_content(&$a) {
header("Content-type: text/html"); header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo (($_GET['msie'] == 1) ? '<div>' : '<section>'); echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
echo str_replace("\t",' ',network_content($a,true));
$text = network_content($a,true);
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text);
echo str_replace("\t",' ',$text);
echo (($_GET['msie'] == 1) ? '</div>' : '</section>'); echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();

View File

@ -1,5 +1,7 @@
<?php <?php
// This page is fetched via ajax to update the profile page with
// new content while you are viewing it.
require_once('mod/profile.php'); require_once('mod/profile.php');
@ -8,7 +10,19 @@ function update_profile_content(&$a) {
header("Content-type: text/html"); header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo (($_GET['msie'] == 1) ? '<div>' : '<section>'); echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
echo str_replace("\t",' ',profile_content($a,true));
// Grab the page inner contents, but move any image src attributes to another attribute name.
// Some browsers will prefetch all the images for the page even if we don't need them.
// The only ones we need to fetch are those for new page additions, which we'll discover
// on the client side and then swap the image back.
$text = profile_content($a,true);
$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
$replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text);
echo str_replace("\t",' ',$text);
echo (($_GET['msie'] == 1) ? '</div>' : '</section>'); echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n"; echo "</body></html>\r\n";
killme(); killme();

View File

@ -61,6 +61,9 @@
$('.wall-item-outside-wrapper',data).each(function() { $('.wall-item-outside-wrapper',data).each(function() {
var ident = $(this).attr('id'); var ident = $(this).attr('id');
if($('#' + ident).length == 0) { if($('#' + ident).length == 0) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
$('#' + prev).after($(this)); $('#' + prev).after($(this));
} }
else { else {