aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2010-12-11 04:41:51 -0800
committerFriendika <info@friendika.com>2010-12-11 04:41:51 -0800
commita50343830f87966b5857be295633d8dff576931a (patch)
treedbe956c31285682bc620ccb7c5f03f2e3785c6e7
parent6b5a83b9b8c3c4fe0e58c92994c3a53e8f3cb175 (diff)
downloadvolse-hubzilla-a50343830f87966b5857be295633d8dff576931a.tar.gz
volse-hubzilla-a50343830f87966b5857be295633d8dff576931a.tar.bz2
volse-hubzilla-a50343830f87966b5857be295633d8dff576931a.zip
preparing for the future
-rw-r--r--htconfig.php1
-rw-r--r--mod/update_profile.php41
-rw-r--r--view/en/htconfig.tpl1
3 files changed, 32 insertions, 11 deletions
diff --git a/htconfig.php b/htconfig.php
index 11719a2c6..6f6e3faf9 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -52,6 +52,7 @@ $a->config['php_path'] = 'php';
// Location of global directory submission page.
$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
diff --git a/mod/update_profile.php b/mod/update_profile.php
index 9a6729396..13c519d1c 100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -1,7 +1,11 @@
<?php
-// This page is fetched via ajax to update the profile page with
-// new content while you are viewing it.
+/**
+ * Module: update_profile
+ * Purpose: AJAX synchronisation of profile page
+ *
+ */
+
require_once('mod/profile.php');
@@ -11,19 +15,34 @@ function update_profile_content(&$a) {
header("Content-type: text/html");
echo "<!DOCTYPE html><html><body>\r\n";
+
+ /**
+ * We can remove this hack once Internet Explorer recognises HTML5 natively
+ */
+
echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
- // 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.
+ /**
+ *
+ * Grab the page inner contents by calling the content function from the profile module directly,
+ * but move any image src attributes to another attribute name. This is because
+ * 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,$profile_uid);
+
+ $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
+ $replace = "<img\${1} dst=\"\${2}\"";
+ $text = preg_replace($pattern, $replace, $text);
- $text = profile_content($a,$profile_uid);
- $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
- $replace = "<img\${1} dst=\"\${2}\"";
- $text = preg_replace($pattern, $replace, $text);
+ /**
+ * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
+ */
- echo str_replace("\t",' ',$text);
+ echo str_replace("\t",' ',$text);
echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
echo "</body></html>\r\n";
killme();
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 33114a868..c7c19bf69 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -50,6 +50,7 @@ $a->config['php_path'] = '$phpath';
// Location of global directory submission page.
$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts