show profile url in ACL hovertips, add fork identifier to json siteinfo

diff --git a/boot.php b/boot.php
index 5b32e05736321831575ede3201a8c9d9e58e4429..2e58f88d9078f7bb64b70f624f6d3332a236ae06 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 require_once('include/nav.php');
 
-
+define ( 'FRIENDIKA_PLATFORM',     'Free Friendika');
 define ( 'FRIENDIKA_VERSION',      '2.3.1116' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1092      );

diff --git a/js/acl.js b/js/acl.js
index ba6c6af7382e5a29faeaa7bbd34f3821d7ef94a1..b270adb6e3123640885718920e1cc6c2110ad2e9 100644 (file)
--- a/js/acl.js
+++ b/js/acl.js
@@ -235,8 +235,8 @@ ACL.prototype.populate = function(data){
        var height = Math.ceil(data.tot / that.nw) * 42;
        that.list_content.height(height);
        $(data.items).each(function(){
-               html = "<div class='acl-list-item {4} {5}' id='{2}{3}'>"+that.item_tpl+"</div>";
-               html = html.format( this.photo, this.name, this.type, this.id, '', this.network );
+               html = "<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>";
+               html = html.format( this.photo, this.name, this.type, this.id, '', this.network, this.link );
                if (this.uids!=undefined) that.group_uids[this.id] = this.uids;
                //console.log(html);
                that.list_content.append(html);

diff --git a/mod/acl.php b/mod/acl.php
index cb5959a95b4b6393158097ef263b9d264ca8ee42..f2d2456a64586a0d23e9032937758cf1ab2377e1 100644 (file)
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -53,12 +53,13 @@ function acl_init(&$a){
                        "photo" => "images/default-group-mm.png",
                        "name"  => $g['name'],
                        "id"    => intval($g['id']),
-                       "uids"  => array_map("intval", explode(",",$g['uids']))
+                       "uids"  => array_map("intval", explode(",",$g['uids'])),
+                       "link"  => ''
                );
        }
        
        
-       $r = q("SELECT `id`, `name`, `micro`, `network` FROM `contact` 
+       $r = q("SELECT `id`, `name`, `micro`, `network`, `url` FROM `contact` 
                WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
                $sql_extra
                ORDER BY `name` ASC ",
@@ -70,7 +71,8 @@ function acl_init(&$a){
                        "photo" => $g['micro'],
                        "name"  => $g['name'],
                        "id"    => intval($g['id']),
-                       "network" => $g['network']
+                       "network" => $g['network'],
+                       "link" => $g['url'],
                );
        }
                

diff --git a/mod/friendika.php b/mod/friendika.php
index c5d7de59fe3e85a9bffda01512ac300436d18450..b12110bd5402a267da7d5ebc2eef1aca20314ced 100644 (file)
--- a/mod/friendika.php
+++ b/mod/friendika.php
@@ -21,6 +21,7 @@ function friendika_init(&$a) {
                        'register_policy' =>  $register_policy[$a->config['register_policy']],
                        'admin' => $admin,
                        'site_name' => $a->config['sitename'],
+                       'platform' => FRIENDIKA_PLATFORM,
                        'info' => ((x($a->config,'info')) ? $a->config['info'] : '')                    
                );