From ab2946047cd08c6b66cbc57410fa8a99430530f6 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Fri, 3 Apr 2009 13:19:33 -0700
Subject: Only kill control and surrogates, leave UTF-8 formatting chars alone.

---
 lib/util.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/util.php b/lib/util.php
index a43666fa5..11f0f297e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -581,10 +581,8 @@ function common_shorten_link($url, $reverse = false)
 
 function common_xml_safe_str($str)
 {
-    $xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8');
-
-    // Replace control, formatting, and surrogate characters with '*', ala Twitter
-    return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str);
+    // Neutralize control codes and surrogates
+	return preg_replace('/[\p{Cc}\p{Cs}]/u', '*', $str);
 }
 
 function common_tag_link($tag)
-- 
cgit v1.2.3-54-g00ecf


From 84d2aa7df49dc85603dd6c2d60c1f605800a458c Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Mon, 6 Apr 2009 01:14:59 +0000
Subject: refactored search suggestions and added forgotten sprintf.

---
 actions/peoplesearch.php | 21 ++-------------------
 lib/searchaction.php     | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'lib')

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 6fbb19b88..3ce719dd5 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -82,25 +82,8 @@ class PeoplesearchAction extends SearchAction
         } else {
             $this->element('p', 'error', _('No results.'));
 
-            $qe = urlencode($q);
-            $message = _(<<<E_O_T
-* Make sure all words are spelled correctly.
-* Try different keywords.
-* Try more general keywords.
-* Try fewer keywords.
-
-You can also try your search on other engines:
-
-* [Twingly](http://www.twingly.com/search?q=$qe&content=microblog&site=identi.ca)
-* [Tweet scan](http://www.tweetscan.com/indexi.php?s=$qe)
-* [Google](http://www.google.com/search?q=site%3Aidenti.ca+$qe)
-* [Yahoo](http://search.yahoo.com/search?p=site%3Aidenti.ca+$qe)
-
-E_O_T
-);
-            $this->elementStart('div', 'blankfiller');
-            $this->raw(common_markup_to_html($message));
-            $this->elementEnd('div');
+//TODO
+            $this->searchSuggestions($q);
             $profile->free();
         }
     }
diff --git a/lib/searchaction.php b/lib/searchaction.php
index c762db16f..697262ccd 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -133,5 +133,28 @@ class SearchAction extends Action
             $this->showResults($q, $page);
         }
     }
+
+    function searchSuggestions($q) {
+        $qe = urlencode($q);
+        $message = sprintf(_(<<<E_O_T
+* Make sure all words are spelled correctly.
+* Try different keywords.
+* Try more general keywords.
+* Try fewer keywords.
+
+You can also try your search on other engines:
+
+* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
+* [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
+* [Google](http://www.google.com/search?q=site%%3Aidenti.ca+%s)
+* [Yahoo](http://search.yahoo.com/search?p=site%%3Aidenti.ca+%s)
+
+
+E_O_T
+), $qe, $qe, $qe, $qe);
+        $this->elementStart('div', 'blankfiller');
+        $this->raw(common_markup_to_html($message));
+        $this->elementEnd('div');
+    }
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 9ad8307b7ee60b3263733b8b8c3d7ac6f350a452 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Mon, 6 Apr 2009 05:04:11 +0000
Subject: external search now depends on site.server.

---
 actions/peoplesearch.php | 2 --
 lib/searchaction.php     | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 3ce719dd5..65d970dd1 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -81,8 +81,6 @@ class PeoplesearchAction extends SearchAction
 
         } else {
             $this->element('p', 'error', _('No results.'));
-
-//TODO
             $this->searchSuggestions($q);
             $profile->free();
         }
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 697262ccd..918f8dd9a 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -146,8 +146,8 @@ You can also try your search on other engines:
 
 * [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
 * [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
-* [Google](http://www.google.com/search?q=site%%3Aidenti.ca+%s)
-* [Yahoo](http://search.yahoo.com/search?p=site%%3Aidenti.ca+%s)
+* [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
+* [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
 
 
 E_O_T
-- 
cgit v1.2.3-54-g00ecf