aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xmod/item.php212
-rw-r--r--tests/get_tags_test.php147
-rw-r--r--tests/xss_filter_test.php88
3 files changed, 255 insertions, 192 deletions
diff --git a/mod/item.php b/mod/item.php
index 81d7c753b..a9edf0da6 100755
--- a/mod/item.php
+++ b/mod/item.php
@@ -425,110 +425,7 @@ function item_post(&$a) {
if(count($tags)) {
foreach($tags as $tag) {
-
- if(isset($profile))
- unset($profile);
- if(strpos($tag,'#') === 0) {
- if(strpos($tag,'[url='))
- continue;
- $basetag = str_replace('_',' ',substr($tag,1));
- $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
-
- $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
- if(! stristr($str_tags,$newtag)) {
- if(strlen($str_tags))
- $str_tags .= ',';
- $str_tags .= $newtag;
- }
- continue;
- }
- if(strpos($tag,'@') === 0) {
- if(strpos($tag,'[url='))
- continue;
- $stat = false;
- $name = substr($tag,1);
- if((strpos($name,'@')) || (strpos($name,'http://'))) {
- $newname = $name;
- $links = @lrdd($name);
- if(count($links)) {
- foreach($links as $link) {
- if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
- $profile = $link['@attributes']['href'];
- if($link['@attributes']['rel'] === 'salmon') {
- if(strlen($inform))
- $inform .= ',';
- $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
- }
- }
- }
- }
- else {
- $newname = $name;
- $alias = '';
- $tagcid = 0;
- if(strrpos($newname,'+')) {
- $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
- if(strpos($name,' '))
- $name = substr($name,0,strpos($name,' '));
- }
- if($tagcid) {
- $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($tagcid),
- intval($profile_uid)
- );
- }
- elseif(strstr($name,'_') || strstr($name,' ')) {
- $newname = str_replace('_',' ',$name);
- $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($newname),
- intval($profile_uid)
- );
- }
- else {
- $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
- dbesc($name),
- dbesc($name),
- intval($profile_uid)
- );
- }
- if(count($r)) {
- $profile = $r[0]['url'];
- if($r[0]['network'] === 'stat') {
- $newname = $r[0]['nick'];
- $stat = true;
- if($r[0]['alias'])
- $alias = $r[0]['alias'];
- }
- else
- $newname = $r[0]['name'];
- if(strlen($inform))
- $inform .= ',';
- $inform .= 'cid:' . $r[0]['id'];
- }
- }
- if($profile) {
- $body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname . '[/url]', $body);
- $profile = str_replace(',','%2c',$profile);
- $newtag = '@[url=' . $profile . ']' . $newname . '[/url]';
- if(! stristr($str_tags,$newtag)) {
- if(strlen($str_tags))
- $str_tags .= ',';
- $str_tags .= $newtag;
- }
-
- // Status.Net seems to require the numeric ID URL in a mention if the person isn't
- // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
-
- if(strlen($alias)) {
- $newtag = '@[url=' . $alias . ']' . $newname . '[/url]';
- if(! stristr($str_tags,$newtag)) {
- if(strlen($str_tags))
- $str_tags .= ',';
- $str_tags .= $newtag;
- }
- }
- }
- }
+ handle_tag($body, $inform, $str_tags, $profile_uid, $tag);
}
}
@@ -922,3 +819,110 @@ function item_content(&$a) {
drop_item($a->argv[2]);
}
}
+
+function handle_body(&$body, &$inform, &$str_tags, $profile_uid, $tag) {
+ $profile=null;
+ if(isset($profile))
+ unset($profile);
+ if(strpos($tag,'#') === 0) {
+ if(strpos($tag,'[url='))
+ continue;
+ $basetag = str_replace('_',' ',substr($tag,1));
+ $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
+
+ $newtag = '#[url=' . $a->get_baseurl() . '/search?search=' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+ if(! stristr($str_tags,$newtag)) {
+ if(strlen($str_tags))
+ $str_tags .= ',';
+ $str_tags .= $newtag;
+ }
+ continue;
+ }
+ if(strpos($tag,'@') === 0) {
+ if(strpos($tag,'[url='))
+ continue;
+ $stat = false;
+ $name = substr($tag,1);
+ if((strpos($name,'@')) || (strpos($name,'http://'))) {
+ $newname = $name;
+ $links = @lrdd($name);
+ if(count($links)) {
+ foreach($links as $link) {
+ if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
+ $profile = $link['@attributes']['href'];
+ if($link['@attributes']['rel'] === 'salmon') {
+ if(strlen($inform))
+ $inform .= ',';
+ $inform .= 'url:' . str_replace(',','%2c',$link['@attributes']['href']);
+ }
+ }
+ }
+ }
+ else {
+ $newname = $name;
+ $alias = '';
+ $tagcid = 0;
+ if(strrpos($newname,'+')) {
+ $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
+ if(strpos($name,' '))
+ $name = substr($name,0,strpos($name,' '));
+ }
+ if($tagcid) {
+ $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ intval($tagcid),
+ intval($profile_uid)
+ );
+ }
+ elseif(strstr($name,'_') || strstr($name,' ')) {
+ $newname = str_replace('_',' ',$name);
+ $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($newname),
+ intval($profile_uid)
+ );
+ }
+ else {
+ $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
+ dbesc($name),
+ dbesc($name),
+ intval($profile_uid)
+ );
+ }
+ if(count($r)) {
+ $profile = $r[0]['url'];
+ if($r[0]['network'] === 'stat') {
+ $newname = $r[0]['nick'];
+ $stat = true;
+ if($r[0]['alias'])
+ $alias = $r[0]['alias'];
+ }
+ else
+ $newname = $r[0]['name'];
+ if(strlen($inform))
+ $inform .= ',';
+ $inform .= 'cid:' . $r[0]['id'];
+ }
+ }
+ if($profile) {
+ $body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname . '[/url]', $body);
+ $profile = str_replace(',','%2c',$profile);
+ $newtag = '@[url=' . $profile . ']' . $newname . '[/url]';
+ if(! stristr($str_tags,$newtag)) {
+ if(strlen($str_tags))
+ $str_tags .= ',';
+ $str_tags .= $newtag;
+ }
+
+ // Status.Net seems to require the numeric ID URL in a mention if the person isn't
+ // subscribed to you. But the nickname URL is OK if they are. Grrr. We'll tag both.
+
+ if(strlen($alias)) {
+ $newtag = '@[url=' . $alias . ']' . $newname . '[/url]';
+ if(! stristr($str_tags,$newtag)) {
+ if(strlen($str_tags))
+ $str_tags .= ',';
+ $str_tags .= $newtag;
+ }
+ }
+ }
+ }
+}
diff --git a/tests/get_tags_test.php b/tests/get_tags_test.php
new file mode 100644
index 000000000..a458f0fbc
--- /dev/null
+++ b/tests/get_tags_test.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * @package test.util
+ */
+
+require_once 'include/template_processor.php';
+require_once 'include/text.php';
+require_once 'mod/item.php';
+
+function q($sql) {
+ return array(array('id'=>15, 'network'=>'stat', 'alias'=>'Mike', 'nick'=>'Mike', 'url'=>"http://justatest.de"));
+
+}
+function dbesc($str) {
+ echo $str;
+}
+
+class GetTagsTest extends PHPUnit_Framework_TestCase {
+
+ public function setUp() {
+ set_include_path(
+ get_include_path() . PATH_SEPARATOR
+ . 'include' . PATH_SEPARATOR
+ . 'library' . PATH_SEPARATOR
+ . 'library/phpsec' . PATH_SEPARATOR
+ . '.' );
+ }
+
+ /**
+ * test with one Person tag
+ */
+ public function testGetTagsShortPerson() {
+ $text="hi @Mike";
+
+ $tags=get_tags($text);
+
+ $inform='';
+ $str_tags='';
+ handle_body($text, $inform, $str_tags, 11, $tags[0]);
+
+ $this->assertEquals("@Mike", $tags[0]);
+ $this->assertEquals($text, "hi @[url=http://justatest.de]Mike[/url]");
+ }
+
+ /**
+ * Test with one hash tag.
+ */
+ public function testGetTagsShortTag() {
+ $text="This is a #test_case";
+
+ $tags=get_tags($text);
+
+ $this->assertEquals("#test_case", $tags[0]);
+ }
+
+ /**
+ * test with a person and a hash tag
+ */
+ public function testGetTagsShortTagAndPerson() {
+ $text="hi @Mike This is a #test_case";
+
+ $tags=get_tags($text);
+
+ $inform='';
+ $str_tags='';
+ handle_body($text, $inform, $str_tags, 11, $tags[0]);
+
+ $this->assertEquals("hi @[url=http://justatest.de]Mike[/url] This is a #test_case", $text);
+ $this->assertEquals("@Mike", $tags[0]);
+ $this->assertEquals("#test_case", $tags[1]);
+ }
+
+ /**
+ * test with a person, a hash tag and some special chars.
+ */
+ public function testGetTagsShortTagAndPersonSpecialChars() {
+ $text="hi @Mike, This is a #test_case.";
+
+ $tags=get_tags($text);
+
+ $this->assertEquals("@Mike", $tags[0]);
+ $this->assertEquals("#test_case", $tags[1]);
+ }
+
+ /**
+ * Test with a person tag and text behind it.
+ */
+ public function testGetTagsPersonOnly() {
+ $text="@Test I saw the Theme Dev group was created.";
+
+ $tags=get_tags($text);
+
+ $this->assertEquals("@Test", $tags[0]);
+ }
+
+ /**
+ * test with two persons and one special tag.
+ */
+ public function testGetTags2Persons1TagSpecialChars() {
+ $text="hi @Mike, I'm just writing #test_cases, so"
+ ." so @somebody@friendica.com may change #things.";
+
+ $tags=get_tags($text);
+
+ $this->assertEquals("@Mike", $tags[0]);
+ $this->assertEquals("#test_cases", $tags[1]);
+ $this->assertEquals("@somebody@friendica.com", $tags[2]);
+ $this->assertEquals("#things", $tags[3]);
+ }
+
+ /**
+ * test with a long text.
+ */
+ public function testGetTags() {
+ $text="hi @Mike, I'm just writing #test_cases, "
+ ." so @somebody@friendica.com may change #things. Of course I "
+ ."look for a lot of #pitfalls, like #tags at the end of a sentence "
+ ."@comment. I hope noone forgets about @fullstops.because that might"
+ ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
+ ."Now, add a @first_last tag. ";
+ //TODO check whether this are all variants (no, auto-stuff is missing).
+
+ $tags=get_tags($text);
+
+ $this->assertEquals("@Mike", $tags[0]);
+ $this->assertEquals("#test_cases", $tags[1]);
+ $this->assertEquals("@somebody@friendica.com", $tags[2]);
+ $this->assertEquals("#things", $tags[3]);
+ $this->assertEquals("#pitfalls", $tags[4]);
+ $this->assertEquals("#tags", $tags[5]);
+ $this->assertEquals("@comment", $tags[6]);
+ $this->assertEquals("@fullstops", $tags[7]);
+ $this->assertEquals("#things", $tags[8]);
+ $this->assertEquals("@Mike", $tags[9]);
+ $this->assertEquals("@campino@friendica.eu", $tags[10]);
+ $this->assertEquals("#nice", $tags[11]);
+ $this->assertEquals("@first_last", $tags[12]);
+ }
+
+ /**
+ * test with an empty string
+ */
+ public function testGetTagsEmpty() {
+ $tags=get_tags("");
+ $this->assertEquals(0, count($tags));
+ }
+} \ No newline at end of file
diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php
index 35d3b1be9..fe944c2a7 100644
--- a/tests/xss_filter_test.php
+++ b/tests/xss_filter_test.php
@@ -1,6 +1,5 @@
<?php
/**
- * Tests, without pHPUnit by now
* @package test.util
*/
@@ -187,93 +186,6 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase {
$this->assertFalse(attribute_contains($testAttr, "class2"));
}
- /**
- * test get_tags
- */
- public function testGetTagsShortPerson() {
- $text="hi @Mike";
-
- $tags=get_tags($text);
-
- $this->assertEquals("@Mike", $tags[0]);
- }
-
- public function testGetTagsShortTag() {
- $text="This is a #test_case";
-
- $tags=get_tags($text);
-
- $this->assertEquals("#test_case", $tags[0]);
- }
-
- public function testGetTagsShortTagAndPerson() {
- $text="hi @Mike This is a #test_case";
-
- $tags=get_tags($text);
-
- $this->assertEquals("@Mike", $tags[0]);
- $this->assertEquals("#test_case", $tags[1]);
- }
-
- public function testGetTagsShortTagAndPersonSpecialChars() {
- $text="hi @Mike, This is a #test_case.";
-
- $tags=get_tags($text);
-
- $this->assertEquals("@Mike", $tags[0]);
- $this->assertEquals("#test_case", $tags[1]);
- }
-
- public function testGetTagsPersonOnly() {
- $text="@Test I saw the Theme Dev group was created.";
-
- $tags=get_tags($text);
-
- $this->assertEquals("@Test", $tags[0]);
- }
-
- public function testGetTags2Persons1TagSpecialChars() {
- $text="hi @Mike, I'm just writing #test_cases, so"
- ." so @somebody@friendica.com may change #things.";
-
- $tags=get_tags($text);
-
- $this->assertEquals("@Mike", $tags[0]);
- $this->assertEquals("#test_cases", $tags[1]);
- $this->assertEquals("@somebody@friendica.com", $tags[2]);
- $this->assertEquals("#things", $tags[3]);
- }
-
- public function testGetTags() {
- $text="hi @Mike, I'm just writing #test_cases, "
- ." so @somebody@friendica.com may change #things. Of course I "
- ."look for a lot of #pitfalls, like #tags at the end of a sentence "
- ."@comment. I hope noone forgets about @fullstops.because that might"
- ." break #things. @Mike@campino@friendica.eu is also #nice, isn't it? "
- ."Now, add a @first_last tag. ";
- //check whether this are all variants (no, auto-stuff is missing).
-
- $tags=get_tags($text);
-
- $this->assertEquals("@Mike", $tags[0]);
- $this->assertEquals("#test_cases", $tags[1]);
- $this->assertEquals("@somebody@friendica.com", $tags[2]);
- $this->assertEquals("#things", $tags[3]);
- $this->assertEquals("#pitfalls", $tags[4]);
- $this->assertEquals("#tags", $tags[5]);
- $this->assertEquals("@comment", $tags[6]);
- $this->assertEquals("@fullstops", $tags[7]);
- $this->assertEquals("#things", $tags[8]);
- $this->assertEquals("@Mike", $tags[9]);
- $this->assertEquals("@campino@friendica.eu", $tags[10]);
- $this->assertEquals("#nice", $tags[11]);
- $this->assertEquals("@first_last", $tags[12]);
- }
-
- public function testGetTagsEmpty() {
- $tags=get_tags("");
- $this->assertEquals(0, count($tags));
- }
//function qp, quick and dirty??
//get_mentions
//get_contact_block, bis Zeile 538
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:04:14 +0000