From 224dfa848bf2659ba038b6e519692d3755eb7bed Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 16 Mar 2012 05:51:04 -0700 Subject: bug #335 network search broken after new ssl policy settings --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/text.php') diff --git a/include/text.php b/include/text.php index d34fd7fbe..cdf82ca87 100644 --- a/include/text.php +++ b/include/text.php @@ -638,7 +638,7 @@ if(! function_exists('search')) { function search($s,$id='search-box',$url='/search',$save = false) { $a = get_app(); $o = '
'; - $o .= '
'; + $o .= ''; $o .= ''; $o .= ''; if($save) -- cgit v1.2.3 From 67fd539f53756723d844dd204639146587f5bb76 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 17 Mar 2012 18:15:36 -0700 Subject: bug #337, call template_unescape() only at the end of template processing --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/text.php') diff --git a/include/text.php b/include/text.php index cdf82ca87..89acbf9fa 100644 --- a/include/text.php +++ b/include/text.php @@ -20,7 +20,7 @@ function replace_macros($s,$r) { //$a = get_app(); //$a->page['debug'] .= "$tt
\n"; - return $r; + return template_unescape($r); }} -- cgit v1.2.3 From 2349852b4abd1638624b541f173f51d1fb1ea011 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 19 Mar 2012 03:18:39 -0700 Subject: support "no_smilies" --- include/text.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/text.php') diff --git a/include/text.php b/include/text.php index 89acbf9fa..a0ff1600e 100644 --- a/include/text.php +++ b/include/text.php @@ -694,8 +694,13 @@ function linkify($s) { if(! function_exists('smilies')) { function smilies($s, $sample = false) { + $a = get_app(); + if(intval(get_config('system','no_smilies')) + || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) + return $s; + $s = preg_replace_callback('/
(.*?)<\/pre>/ism','smile_encode',$s);
 	$s = preg_replace_callback('/(.*?)<\/code>/ism','smile_encode',$s);
 
-- 
cgit v1.2.3


From 139a86dbd395f4601b29b9af97ac8ea190cce9f9 Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 19 Mar 2012 06:48:11 -0700
Subject: some openid fixes, use identity url from openid server and normalise
 it.

---
 include/text.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index a0ff1600e..2956c9467 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1355,3 +1355,6 @@ function file_tag_unsave_file($uid,$item,$file) {
 	return true;
 }
 
+function normalise_openid($s) {
+	return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
+}
-- 
cgit v1.2.3


From e9b33a6f1f42899a4d46cb23421085cdc2bbbaa6 Mon Sep 17 00:00:00 2001
From: Thomas 
Date: Mon, 19 Mar 2012 21:59:06 +0000
Subject: 	modified:   include/text.php 	deleted:   
 images/diaspora.png 	deleted:    images/smiley-bangheaddesk.gif 
 deleted:    images/smiley-beard.png 	deleted:    images/smiley-shaka.gif 
 deleted:    images/smiley-whitebeard.png

Removed selected smiley per Mike's request.  Also removed deprecated smileys that were just commented out.
---
 include/text.php | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 2956c9467..ed37326df 100644
--- a/include/text.php
+++ b/include/text.php
@@ -709,27 +709,20 @@ function smilies($s, $sample = false) {
 		'</3', 
 		'<\\3', 
 		':-)', 
-//		':)', 
 		';-)', 
-//		';)', 
 		':-(', 
-//		':(', 
 		':-P', 
-//		':P', 
 		':-"', 
 		':-"', 
 		':-x', 
 		':-X', 
 		':-D', 
-//		':D', 
 		'8-|', 
 		'8-O', 
 		':-O', 
 		'\\o/', 
 		'o.O', 
 		'O.o', 
-		'\\.../', 
-		'\\ooo/', 
 		":'(", 
 		":-!", 
 		":-/", 
@@ -742,9 +735,6 @@ function smilies($s, $sample = false) {
 		':headdesk',
 		'~friendika', 
 		'~friendica', 
-//		'Diaspora*' 
-		':beard',
-		':whitebeard'
 
 	);
 
@@ -753,27 +743,20 @@ function smilies($s, $sample = false) {
 		'</3',
 		'<\\3',
 		':-)',
-//		':)',
 		';-)',
-//		';)',                
 		':-(',
-//		':(',
 		':-P',
-//		':P',
 		':-\',
 		':-\',
 		':-x',
 		':-X',
 		':-D',
-//		':D',                
 		'8-|',
 		'8-O',
 		':-O',                
 		'\\o/',
 		'o.O',
 		'O.o',
-		'\\.../',
-		'\\ooo/',
 		':\'(',
 		':-!',
 		':-/',
@@ -783,12 +766,8 @@ function smilies($s, $sample = false) {
 		':homebrew',
 		':coffee',
 		':facepalm',
-		':headdesk',
 		'~friendika ~friendika',
 		'~friendica ~friendica',
-//		'DiasporaDiaspora*',
-		':beard',
-		':whitebeard'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
-- 
cgit v1.2.3


From 84f8e2eaa87c90473ce79ebcd4f76f3657258f27 Mon Sep 17 00:00:00 2001
From: Thomas 
Date: Mon, 19 Mar 2012 22:32:19 +0000
Subject: 	modified:   include/text.php Stupid bug fixed

---
 include/text.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index ed37326df..527f3a344 100644
--- a/include/text.php
+++ b/include/text.php
@@ -732,9 +732,8 @@ function smilies($s, $sample = false) {
 		':homebrew', 
 		':coffee', 
 		':facepalm',
-		':headdesk',
 		'~friendika', 
-		'~friendica', 
+		'~friendica'
 
 	);
 
@@ -767,7 +766,7 @@ function smilies($s, $sample = false) {
 		':coffee',
 		':facepalm',
 		'~friendika ~friendika',
-		'~friendica ~friendica',
+		'~friendica ~friendica'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
-- 
cgit v1.2.3


From d81256d7b051d9a76b087feeb64ac79fb4aeff4d Mon Sep 17 00:00:00 2001
From: friendica 
Date: Wed, 21 Mar 2012 21:45:45 -0700
Subject: support lowercase :-p smilie

---
 include/text.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 527f3a344..92a74eb49 100644
--- a/include/text.php
+++ b/include/text.php
@@ -712,6 +712,7 @@ function smilies($s, $sample = false) {
 		';-)', 
 		':-(', 
 		':-P', 
+		':-p', 
 		':-"', 
 		':-"', 
 		':-x', 
@@ -745,6 +746,7 @@ function smilies($s, $sample = false) {
 		';-)',
 		':-(',
 		':-P',
+		':-p',
 		':-\',
 		':-\',
 		':-x',
-- 
cgit v1.2.3


From 528d795fb68a8ae53cb7b9ad8479aeaa2b1f975f Mon Sep 17 00:00:00 2001
From: friendica 
Date: Thu, 22 Mar 2012 16:17:10 -0700
Subject: ability to change tags in edited posts

---
 include/text.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 92a74eb49..6f66cef65 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1338,3 +1338,16 @@ function file_tag_unsave_file($uid,$item,$file) {
 function normalise_openid($s) {
 	return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
 }
+
+
+function undo_post_tagging($s) {
+	$matches = null;
+	$cnt = preg_match_all('/([@#])\[url=(.*?)\](.*?)\[\/url\]/ism',$s,$matches,PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$s = str_replace($mtch[0], $mtch[1] . $mtch[3],$s);
+		}
+	}
+	return $s;
+}
+
-- 
cgit v1.2.3


From 7aec2fd68d6cec75d14c02b63a150d904aae817e Mon Sep 17 00:00:00 2001
From: Fabio Comuni 
Date: Wed, 28 Mar 2012 10:45:16 +0200
Subject: filer: info() on item filed

---
 include/text.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/text.php')

diff --git a/include/text.php b/include/text.php
index 6f66cef65..5aaf04729 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1300,6 +1300,7 @@ function file_tag_save_file($uid,$item,$file) {
 		$saved = get_pconfig($uid,'system','filetags');
 		if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
 			set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
+		info( t('Item filed') );
 	}
 	return true;
 }
-- 
cgit v1.2.3