aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-27 05:02:25 -0700
committerFriendika <info@friendika.com>2011-09-27 05:02:25 -0700
commit7e2284043f7367f531e14ce3c26c8c3c71ca2e4b (patch)
treea4cf3078f3b258ddd8a14fc13bb80bc89a1ae740
parent1e288dc8a3169a313876ea671979b40c29722752 (diff)
downloadvolse-hubzilla-7e2284043f7367f531e14ce3c26c8c3c71ca2e4b.tar.gz
volse-hubzilla-7e2284043f7367f531e14ce3c26c8c3c71ca2e4b.tar.bz2
volse-hubzilla-7e2284043f7367f531e14ce3c26c8c3c71ca2e4b.zip
show profile url in ACL hovertips, add fork identifier to json siteinfo
-rw-r--r--boot.php2
-rw-r--r--js/acl.js4
-rw-r--r--mod/acl.php8
-rw-r--r--mod/friendika.php1
4 files changed, 9 insertions, 6 deletions
diff --git a/boot.php b/boot.php
index 5b32e0573..2e58f88d9 100644
--- 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 ba6c6af73..b270adb6e 100644
--- 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 cb5959a95..f2d2456a6 100644
--- 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 c5d7de59f..b12110bd5 100644
--- 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'] : '')
);