@ tag completion enhancements, show url on hover and respect custom attags

diff --git a/boot.php b/boot.php
index 9582147cac5eafe82e46b9861e93be8ba5d64787..707ca198829fb99c5dac1f8c742aadc1bdb1046b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
 define ( 'FRIENDIKA_VERSION',      '2.3.1146' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
-define ( 'DB_UPDATE_VERSION',      1098      );
+define ( 'DB_UPDATE_VERSION',      1099      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );

diff --git a/database.sql b/database.sql
index 5d7a3020cf19845606f8c74e1adbfc3e1f756038..ead3637955434099e5f2247649f03c46325cde09 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -100,6 +100,13 @@ CREATE TABLE IF NOT EXISTS `contact` (
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
   KEY `self` (`self`),
+  KEY `network` (`network`),
+  KEY `name` (`name`),
+  KEY `nick` (`nick`),
+  KEY `attag` (`attag`),
+  KEY `url` (`url`),
+  KEY `addr` (`addr`),
+  KEY `batch` (`batch`),
   KEY `issued-id` (`issued-id`),
   KEY `dfrn-id` (`dfrn-id`),
   KEY `blocked` (`blocked`),

diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js
index 1484758add7091ccecf1994305ab45553b4a0290..6a1f1965aa9b429ab357f10bf1cacd3f479c50e1 100644 (file)
--- a/js/fk.autocomplete.js
+++ b/js/fk.autocomplete.js
@@ -65,7 +65,7 @@ ACPopup.prototype._search = function(){
                                that.cont.show();
                                $(data.items).each(function(){
                                        html = "<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo, this.name, this.nick)
-                                       that.add(html, this.nick);
+                                       that.add(html, this.nick + ' - ' + this.link);
                                });                     
                        } else {
                                that.cont.hide();
@@ -78,7 +78,7 @@ ACPopup.prototype.add = function(label, value){
        var that=this;
        var elm = $("<div class='acpopupitem' title='"+value+"'>"+label+"</div>");
        elm.click(function(e){
-               t = $(this).attr('title');
+                       t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
                el=$(that.element);
                sel = el.getSelection();
                sel.start = sel.start- that.searchText.length;

diff --git a/mod/acl.php b/mod/acl.php
index 07ca096e5bbec2f963b74d5d2d891d788a9088b8..735c2c0b00653370e1b6f0d61cf33086d21dd781 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -15,7 +15,7 @@ function acl_init(&$a){
 
        if ($search!=""){
                $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
-               $sql_extra2 = "AND (`name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
+               $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
        }
        
        // count groups and contacts
@@ -89,7 +89,7 @@ function acl_init(&$a){
                                "id"    => intval($g['id']),
                                "network" => $g['network'],
                                "link" => $g['url'],
-                               "nick" => $g['nick'],
+                               "nick" => ($g['attag']) ? $g['attag'] : $g['nick'],
                        );
                }
                        

diff --git a/update.php b/update.php
index c85962691758c6e97d41d6ad6902e82ec0d635e2..8f1cee75b4c65fffefd23123d49c89b5fb6126ed 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1098 );
+define( 'UPDATE_VERSION' , 1099 );
 
 /**
  *
@@ -806,6 +806,29 @@ function update_1097() {
                ADD INDEX (`created`), 
                ADD INDEX (`last`), 
                ADD INDEX (`network`), 
-               ADD INDEX (`batch`) ");
+               ADD INDEX (`batch`) 
+       ");
 }
 
+function update_1098() {
+       q("ALTER TABLE `contact` 
+               ADD INDEX (`network`), 
+               ADD INDEX (`name`), 
+               ADD INDEX (`nick`), 
+               ADD INDEX (`attag`), 
+               ADD INDEX (`url`),
+               ADD INDEX (`addr`), 
+               ADD INDEX (`batch`) 
+       ");
+}
+
+
+
+
+
+
+
+
+
+
+