Issue 3860: Enhanced support of "!" for forums

diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 14f5dcfe0c797271ab5d09720223c2a8675d82a8..58a7378e294457f61cc2fd1c8273819a482042ff 100755 (executable)
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -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");
        }
 
        /**

diff --git a/include/bbcode.php b/include/bbcode.php
index a14e3ee8e9b88f9377b6d9ed02adb73b1e18e59e..ee740e18caf95bb23f43cf4eb3e6ed80f73f9901 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -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

diff --git a/js/acl.js b/js/acl.js
index 1ed354bbfaa75e0d4cb08e4c5ff18e3a0dbaf449..9a575729f642a149aa16ac29319540c91b8e2383 100644 (file)
--- a/js/acl.js
+++ b/js/acl.js
@@ -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 ) {

diff --git a/mod/network.php b/mod/network.php
index f79becd9d0af2d0717c572aac7c3a0a68c8c528f..e09fdd8fec9e5ece5b04fb99c00dab3c3a5d4544 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -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;
                                }
                        }
                }