harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge the app menus

Browse Source
This commit is contained in:
friendica
2014-06-10 21:21:50 -07:00
parent e41375c889
commit 13ba9ef003
5 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/apps.php
View File

@@ -62,18 +62,21 @@ function parse_app_description($f) {
}
if(! $ret['photo'])
$ret['photo'] = $baseurl . '/' . get_default_profile_photo(80);
$ret['type'] = 'system';
foreach($ret as $k => $v) {
if(strpos($v,'http') === 0)
$ret[$k] = zid($v);
}
if(array_key_exists('hover',$ret))
$ret['hover'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['hover']);
if(array_key_exists('desc',$ret))
$ret['desc'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['desc']);
if(array_key_exists('target',$ret))
$ret['target'] = str_replace(array('\'','"'),array(''','&dquot;'),$ret['target']);
if(array_key_exists('requires',$ret)) {
$require = trim(strtolower($ret['requires']));
@@ -270,6 +273,11 @@ function app_list($uid) {
$r = q("select * from app where app_channel = %d order by app_name asc",
intval($uid)
);
if($r) {
for($x = 0; $x < count($r); $x ++) {
$r[$x]['type'] = 'personal';
}
}
return($r);
}
@@ -391,6 +399,8 @@ function app_encode($app,$embed = false) {
$ret = array();
$ret['type'] = 'personal';
if($app['app_id'])
$ret['guid'] = $app['app_id'];