strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3862 from annando/issue-3860

Browse source 
Issue 3860: Enhanced support of "!" for forums
This commit is contained in:
Tobias Diekershoff 2017-11-03 07:15:51 +01:00 committed by GitHub
parent 7003f576e2 d739fe2503
commit 6b9cb9c755
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/auth_ejabberd.php
View file

@ -307,7 +307,7 @@ class exAuth {
*/
private function writeLog($sMessage) {
if (is_resource($this->rLogFile))
fwrite($this->rLogFile, date("r")." ".$sMessage."\n");
fwrite($this->rLogFile, date("r")." ".getmypid()." ".$sMessage."\n");
}
/**

14
include/bbcode.php
View file

@ -940,17 +940,17 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
// Remove all hashtag addresses
if ((!$tryoembed || $simplehtml) && !in_array($simplehtml, array(3, 7))) {
$Text = preg_replace("/([#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
$Text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);
} elseif ($simplehtml == 3) {
$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1<a href="$2">$3</a>',
$Text);
} elseif ($simplehtml == 7) {
$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1<span class="vcard"><a href="$2" class="url" title="$3"><span class="fn nickname mention">$3</span></a></span>',
$Text);
} elseif (!$simplehtml) {
$Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
$Text = preg_replace("/([@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
'$1<a href="$2" class="userinfo mention" title="$3">$3</a>',
$Text);
}
@ -962,13 +962,13 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
"[bookmark=$1]$2[/bookmark]", $Text);
if (in_array($simplehtml, array(2, 6, 7, 8, 9))) {
$Text = preg_replace_callback("/([^#@])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text);
//$Text = preg_replace("/[^#@]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
$Text = preg_replace_callback("/([^#@!])\[url\=([^\]]*)\](.*?)\[\/url\]/ism", "bb_expand_links", $Text);
//$Text = preg_replace("/[^#@!]\[url\=([^\]]*)\](.*?)\[\/url\]/ism", ' $2 [url]$1[/url]', $Text);
$Text = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", ' $2 [url]$1[/url]',$Text);
}
if ($simplehtml == 5) {
$Text = preg_replace("/[^#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
$Text = preg_replace("/[^#@!]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[url]$1[/url]', $Text);
}
// Perform URL Search

8
js/acl.js
View file

@ -50,9 +50,9 @@ ACL.prototype.remove_mention = function(id) {
var addr = this.data[id].addr;
if (addr != "") {
var searchText = "@" + addr + " ";
var searchText = "!" + addr + " ";
} else {
var searchText = "@" + nick + "+" + id + " ";
var searchText = "!" + nick + "+" + id + " ";
}
var start = this.element.val().indexOf(searchText);
@ -71,9 +71,9 @@ ACL.prototype.add_mention = function(id) {
var addr = this.data[id].addr;
if (addr != "") {
var searchText = "@" + addr + " ";
var searchText = "!" + addr + " ";
} else {
var searchText = "@" + nick + "+" + id + " ";
var searchText = "!" + nick + "+" + id + " ";
}
if (this.element.val().indexOf( searchText) >= 0 ) {

4
mod/network.php
View file

@ -577,9 +577,9 @@ function networkThreadedView(App $a, $update = 0) {
$contact = dba::select('contact', array('addr', 'nick'), $condition, array('limit' => 1));
if (dbm::is_result($contact)) {
if ($contact["addr"] != '') {
$content = "@".$contact["addr"];
$content = "!".$contact["addr"];
} else {
$content = "@".$contact["nick"]."+".$cid;
$content = "!".$contact["nick"]."+".$cid;
}
}
}