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

Merge remote-tracking branch 'upstream/dev' into dev

Browse Source
This commit is contained in:
zottel 2016-05-05 20:47:15 +02:00
commit 0314624aeb
33 changed files with 669 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Zotlabs/Module/Appman.php
View File

@ -1,5 +1,6 @@
<?php
namespace Zotlabs\Module; /** @file */
<?php /** @file */
namespace Zotlabs\Module;
require_once('include/apps.php');
@ -23,7 +24,10 @@ class Appman extends \Zotlabs\Web\Controller {
'photo' => escape_tags($_REQUEST['photo']),
'version' => escape_tags($_REQUEST['version']),
'price' => escape_tags($_REQUEST['price']),
'sig' => escape_tags($_REQUEST['sig'])
'requires' => escape_tags($_REQUEST['requires']),
'system' => intval($_REQUEST['system']),
'sig' => escape_tags($_REQUEST['sig']),
'categories' => escape_tags($_REQUEST['categories'])
);
$_REQUEST['appid'] = app_install(local_channel(),$arr);
@ -79,8 +83,23 @@ class Appman extends \Zotlabs\Web\Controller {
dbesc($_REQUEST['appid']),
dbesc(local_channel())
);
if($r)
if($r) {
$app = $r[0];
$term = q("select * from term where otype = %d and oid = %d",
intval(TERM_OBJ_APP),
intval($r[0]['id'])
);
if($term) {
$app['categories'] = '';
foreach($term as $t) {
if($app['categories'])
$app['categories'] .= ',';
$app['categories'] .= $t['term'];
}
}
}
$embed = array('embed', t('Embed code'), app_encode($app,true),'', 'onclick="this.select();"');
}
@ -96,9 +115,12 @@ class Appman extends \Zotlabs\Web\Controller {
'$url' => array('url', t('Location (URL) of app'),(($app) ? $app['app_url'] : ''), t('Required')),
'$desc' => array('desc', t('Description'),(($app) ? $app['app_desc'] : ''), ''),
'$photo' => array('photo', t('Photo icon URL'),(($app) ? $app['app_photo'] : ''), t('80 x 80 pixels - optional')),
'$categories' => array('categories',t('Categories (optional, comma separated list)'),(($app) ? $app['categories'] : ''),''),
'$version' => array('version', t('Version ID'),(($app) ? $app['app_version'] : ''), ''),
'$price' => array('price', t('Price of app'),(($app) ? $app['app_price'] : ''), ''),
'$page' => array('page', t('Location (URL) to purchase app'),(($app) ? $app['app_page'] : ''), ''),
'$system' => (($app) ? intval($app['app_system']) : 0),
'$requires' => (($app) ? $app['app_requires'] : ''),
'$embed' => $embed,
'$submit' => t('Submit')
));

10
Zotlabs/Module/Apps.php
View File

@ -17,16 +17,21 @@ class Apps extends \Zotlabs\Web\Controller {
$apps = array();
$syslist = get_system_apps();
if(local_channel()) {
$list = app_list(local_channel());
import_system_apps();
$syslist = array();
$list = app_list(local_channel(), false, $_GET['cat']);
if($list) {
foreach($list as $x) {
$syslist[] = app_encode($x);
}
}
translate_system_apps($syslist);
}
else
$syslist = get_system_apps(true);
usort($syslist,'app_name_compare');
// logger('apps: ' . print_r($syslist,true));
@ -37,6 +42,7 @@ class Apps extends \Zotlabs\Web\Controller {
return replace_macros(get_markup_template('myapps.tpl'), array(
'$sitename' => get_config('system','sitename'),
'$cat' => ((array_key_exists('cat',$_GET) && $_GET['cat']) ? ' - ' . escape_tags($_GET['cat']) : ''),
'$title' => t('Apps'),
'$apps' => $apps,
));

10
Zotlabs/Module/Channel.php
View File

@ -126,13 +126,21 @@ function get($update = 0, $load = false) {
if($perms['post_wall']) {
// I'm trying to make two points in this description text - warn about finality of wall
// post permissions, and try to clear up confusion that these permissions set who is
// *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking
// the "Show" button on a group does not post it to the feed of people in that group, it
// mearly allows those people to view the post if they are viewing/following this channel.
$aclDesc = t('Post permissions <b>cannot be changed</b> after a post is sent.</br />These permissions set who is allowed to view the post.');
$aclContextHelpCmd = 'acl_dialog_post';
$x = array(
'is_owner' => $is_owner,
'allow_location' => ((($is_owner || $observer) && (intval(get_pconfig(\App::$profile['profile_uid'],'system','use_browser_location')))) ? true : false),
'default_location' => (($is_owner) ? \App::$profile['channel_location'] : ''),
'nickname' => \App::$profile['channel_address'],
'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
'acl' => (($is_owner) ? populate_acl($channel_acl,true,((\App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')) : ''),
'acl' => (($is_owner) ? populate_acl($channel_acl,true,((\App::$profile['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), $aclDesc, $aclContextHelpCmd) : ''),
'showacl' => (($is_owner) ? 'yes' : ''),
'bang' => '',
'visitor' => (($is_owner || $observer) ? true : false),

6
Zotlabs/Module/Editblock.php
View File

@ -4,7 +4,6 @@ namespace Zotlabs\Module;
require_once('include/identity.php');
require_once('include/acl_selectors.php');
class Editblock extends \Zotlabs\Web\Controller {
function init() {
@ -25,8 +24,6 @@ class Editblock extends \Zotlabs\Web\Controller {
}
function get() {
if(! \App::$profile) {
@ -77,7 +74,6 @@ class Editblock extends \Zotlabs\Web\Controller {
// Figure out which post we're editing
$post_id = ((argc() > 2) ? intval(argv(2)) : 0);
if(! ($post_id && $owner)) {
notice( t('Item not found') . EOL);
return;
@ -186,6 +182,4 @@ class Editblock extends \Zotlabs\Web\Controller {
}
}

3
Zotlabs/Module/Follow.php
View File

@ -20,6 +20,9 @@ class Follow extends \Zotlabs\Web\Controller {
$channel = \App::get_channel();
// Warning: Do not edit the following line. The first symbol is UTF-8 &#65312;
$url = str_replace('@','@',$url);
$result = new_contact($uid,$url,$channel,true,$confirm);
if($result['success'] == false) {

10
Zotlabs/Module/Network.php
View File

@ -155,6 +155,14 @@ class Network extends \Zotlabs\Web\Controller {
nav_set_selected('network');
// I'm trying to make two points in this description text - warn about finality of wall
// post permissions, and try to clear up confusion that these permissions set who is
// *shown* the post, istead of who is able to see the post, i.e. make it clear that clicking
// the "Show" button on a group does not post it to the feed of people in that group, it
// mearly allows those people to view the post if they are viewing/following this channel.
$aclDesc = t('Post permissions <b>cannot be changed</b> after a post is sent.</br />These permissions set who is allowed to view the post.');
$aclContextHelpCmd = 'acl_dialog_post';
$channel_acl = array(
'allow_cid' => $channel['channel_allow_cid'],
'allow_gid' => $channel['channel_allow_gid'],
@ -170,7 +178,7 @@ class Network extends \Zotlabs\Web\Controller {
'default_location' => $channel['channel_location'],
'nickname' => $channel['channel_address'],
'lockstate' => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : '')),
'acl' => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, (($channel['channel_r_stream'] & PERMS_PUBLIC) ? t('Public') : ''), $aclDesc, $aclContextHelpCmd),
'bang' => (($private_editing) ? '!' : ''),
'visitor' => true,
'profile_uid' => local_channel(),

44
Zotlabs/Text/Tagadelic.php Normal file
View File

@ -0,0 +1,44 @@
<?php
namespace Zotlabs\Text;
class Tagadelic {
static public function calc($arr) {
$tags = array();
$min = 1e9;
$max = -1e9;
$x = 0;
if(! $arr)
return array();
foreach($arr as $rr) {
$tags[$x][0] = $rr['term'];
$tags[$x][1] = log($rr['total']);
$tags[$x][2] = 0;
$min = min($min,$tags[$x][1]);
$max = max($max,$tags[$x][1]);
$x ++;
}
usort($tags,'self::tags_sort');
$range = max(.01, $max - $min) * 1.0001;
for($x = 0; $x < count($tags); $x ++) {
$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
}
return $tags;
}
static public function tags_sort($a,$b) {
if(strtolower($a[0]) == strtolower($b[0]))
return 0;
return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
}
}

2
app/bookmarks.apd
View File

@ -1,4 +1,4 @@
url: $baseurl/bookmarks
requires: local_channel
name: View bookmarks
name: View Bookmarks
photo: $baseurl/app/bookmarks.png

2
app/chat.apd
View File

@ -1,4 +1,4 @@
url: $baseurl/chat/$nick
requires: local_channel
name: My chatrooms
name: My Chatrooms
photo: $baseurl/app/chat.png

2
app/probe.apd
View File

@ -1,4 +1,4 @@
url: $baseurl/probe
requires: local_channel
name: Remote diagnostics
name: Remote Diagnostics
photo: $baseurl/app/probe.png

2
app/profile.apd
View File

@ -1,4 +1,4 @@
url: $baseurl/profile/$nick
requires: local_channel
name: View profile
name: View Profile
photo: $baseurl/app/profile.png

2
app/suggest.apd
View File

@ -1,4 +1,4 @@
url: $baseurl/suggest
requires: local_channel
name: Suggest channels
name: Suggest Channels
photo: $baseurl/app/suggest.png

2
boot.php
View File

@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'STD_VERSION', '1.4.4' );
define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1167 );
define ( 'DB_UPDATE_VERSION', 1168 );
/**

13
doc/acl_dialog_post.html Normal file
View File

@ -0,0 +1,13 @@
<!-- Network and channel posts cannot change their permissions after being sent, this help
file is for items of that nature. Files and photos etc should use a different help file. -->
<h2>Post Permissions</h2>
<p>Sometimes called Access Control List, or ACL, the permissions set who is able to see your new post.</p>
<p>Pressing the ACL button (<i class="fa fa-lock"></i> or <i class="fa fa-unlock"></i>) beside the Submit button will display a dialog in which you can select what channels and/or privacy groups can see the post. You can also select who is explicitly denied access. For example, say you are planning a surprise party for a friend. You can send an invitation post to everyone in your <b>Friends</b> group <i>except</i> the friend you are surprising. In this case you "Show" the <b>Friends</b> group but "Don't show" that one person.
<h3>Why can't I edit a post's permissions after I saved it?</h3>
<p>You are able to change permissons to your files, photos and the likes, but not to posts after you have saved them. The main reason is: Once you have saved a post it is being distributed either to the public channel and from there to other Hubzilla servers or to those you intended it to go. Just like you cannot reclaim something you gave to another person, you cannot change permissions to Hubzilla posts. We would need to track everywhere your posting goes, keep track of everyone you allowed to see it and then keep track of from whom to delete it.</p>
<p>If a posting is public this is even harder, as the Hubzilla is a global network and there is no way to follow a post, let alone reclaim it reliably. Other networks that may receive your post have no reliable way to delete or reclaim the post.</p>

6
doc/to_do_code.bb
View File

@ -25,8 +25,8 @@ We need much more than this, but here are areas where developers can help. Pleas
[li](less advanced) create a way to preview Comanche results on a preview page while editing on another page[/li]
[li]External post connectors - create standard interface[/li]
[li]External post connectors, add popular services[/li]
[li](in progress Habeas Codice) service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
[li](in progress Habeas Codice) service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
[li]service classes - provide a pluggable subscription payment gateway for premium accounts[/li]
[li]service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li]
[li]implement CalDAV/CardDAV sync[/li]
[li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li]
[li]API extensions, for Twitter API - search, friending, threading. For Red API, lots of stuff[/li]
@ -36,7 +36,7 @@ We need much more than this, but here are areas where developers can help. Pleas
[li]Customisable App collection pages[/li]
[li]replace the tinymce visual editor and/or make the visual editor pluggable and responsive to different output formats. We probably want library/bbedit for bbcode. This needs a fair bit of work to catch up with our &quot;enhanced bbcode&quot;, but start with images, links, bold and highlight and work from there.[/li]
[li]Create mobile clients for the top platforms - which involves extending the API so that we can do stuff far beyond the current crop of Twitter/Statusnet clients. Ditto for mobile themes. We can probably use something like the Friendica Android app as a base to start from.[/li]
[li](in progress Habeas Codice) Implement owned and exchangeable &quot;things&quot;.[/li]
[li]Implement owned and exchangeable &quot;things&quot;.[/li]
[li]Family Account creation - using service classes (an account holder can create a certain number of sub-accounts which are all tied to their subscription - if the subscription lapses they all go away).[/li]

27
include/acl_selectors.php
View File

@ -210,12 +210,24 @@ function fixacl(&$item) {
$item = str_replace(array('<','>'),array('',''),$item);
}
function populate_acl($defaults = null,$show_jotnets = true, $showall = '') {
/**
* Builds a modal dialog for editing permissions, using acl_selector.tpl as the template.
*
* @param array $default Optional access control list for the initial state of the dialog.
* @param boolean $show_jotnets Whether plugins for federated networks should be included in the permissions dialog
* @param string $showall_caption An optional caption to describe the scope of an unrestricted post. e.g. "Public"
* @param string $dialog_description Optional message to include at the top of the dialog. E.g. "Warning: Post permissions cannot be changed once sent".
* @param string $context_help Allows the dialog to present a help icon. E.g. "acl_dialog_post"
* @param boolean $readonly Not implemented yet. When implemented, the dialog will use acl_readonly.tpl instead, so that permissions may be viewed for posts that can no longer have their permissions changed.
*
* @return string html modal dialog build from acl_selector.tpl
*/
function populate_acl($defaults = null,$show_jotnets = true, $showall_caption = '', $dialog_description = '', $context_help = '', $readonly = false) {
$allow_cid = $allow_gid = $deny_cid = $deny_gid = false;
if(! $showall)
$showall = t('Visible to your default audience');
if(! $showall_caption)
$showall_caption = t('Visible to your default audience');
if(is_array($defaults)) {
$allow_cid = ((strlen($defaults['allow_cid']))
@ -239,9 +251,12 @@ function populate_acl($defaults = null,$show_jotnets = true, $showall = '') {
$tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array(
'$showall' => $showall,
'$showall' => $showall_caption,
'$showlimited' => t("Limit access:"),
'$showlimitedDesc' => t('Select "Show" to allow viewing. "Don\'t show" lets you override and limit the scope of "Show".'),
'$show' => t("Show"),
'$hide' => t("Don't show"),
'$search' => t("Search"),
'$allowcid' => json_encode($allow_cid),
'$allowgid' => json_encode($allow_gid),
'$denycid' => json_encode($deny_cid),
@ -249,7 +264,9 @@ function populate_acl($defaults = null,$show_jotnets = true, $showall = '') {
'$jnetModalTitle' => t('Other networks and post services'),
'$jotnets' => $jotnets,
'$aclModalTitle' => t('Permissions'),
'$aclModalDismiss' => t('Close')
'$aclModalDesc' => $dialog_description,
'$aclModalDismiss' => t('Close'),
'$helpUrl' => (($context_help == '') ? '' : (z_root() . '/help/' . $context_help))
));
return $o;

179
include/apps.php
View File

@ -8,7 +8,7 @@
require_once('include/plugin.php');
require_once('include/identity.php');
function get_system_apps() {
function get_system_apps($translate = true) {
$ret = array();
if(is_dir('apps'))
@ -17,7 +17,7 @@ function get_system_apps() {
$files = glob('app/*.apd');
if($files) {
foreach($files as $f) {
$x = parse_app_description($f);
$x = parse_app_description($f,$translate);
if($x) {
$ret[] = $x;
}
@ -28,7 +28,7 @@ function get_system_apps() {
foreach($files as $f) {
$n = basename($f,'.apd');
if(plugin_is_installed($n)) {
$x = parse_app_description($f);
$x = parse_app_description($f,$translate);
if($x) {
$ret[] = $x;
}
@ -40,11 +40,37 @@ function get_system_apps() {
}
function import_system_apps() {
if(! local_channel())
return;
// Eventually we want to look at modification dates and update system apps.
$installed = get_pconfig(local_channel(),'system','apps_installed');
if($installed)
return;
$apps = get_system_apps(false);
if($apps) {
foreach($apps as $app) {
$app['uid'] = local_channel();
$app['guid'] = hash('whirlpool',$app['name']);
$app['system'] = 1;
app_install(local_channel(),$app);
}
}
set_pconfig(local_channel(),'system','apps_installed',1);
}
function app_name_compare($a,$b) {
return strcmp($a['name'],$b['name']);
}
function parse_app_description($f) {
function parse_app_description($f,$translate = true) {
$ret = array();
$baseurl = z_root();
@ -116,6 +142,7 @@ function parse_app_description($f) {
}
}
if($ret) {
if($translate)
translate_system_apps($ret);
return $ret;
}
@ -126,8 +153,13 @@ function parse_app_description($f) {
function translate_system_apps(&$arr) {
$apps = array(
'Site Admin' => t('Site Admin'),
'Bookmarks' => t('Bookmarks'),
'Address Book' => t('Address Book'),
'Bug Report' => t('Bug Report'),
'View Bookmarks' => t('View Bookmarks'),
'My Chatrooms' => t('My Chatrooms'),
'Connections' => t('Connections'),
'Firefox Share' => t('Firefox Share'),
'Remote Diagnostics' => t('Remote Diagnostics'),
'Suggest Channels' => t('Suggest Channels'),
'Login' => t('Login'),
'Channel Manager' => t('Channel Manager'),
'Grid' => t('Grid'),
@ -135,7 +167,7 @@ function translate_system_apps(&$arr) {
'Files' => t('Files'),
'Webpages' => t('Webpages'),
'Channel Home' => t('Channel Home'),
'Profile' => t('Profile'),
'View Profile' => t('View Profile'),
'Photos' => t('Photos'),
'Events' => t('Events'),
'Directory' => t('Directory'),
@ -264,6 +296,7 @@ function app_render($papp,$mode = 'view') {
function app_install($uid,$app) {
$app['uid'] = $uid;
if(app_installed($uid,$app))
$x = app_update($app);
else
@ -274,9 +307,17 @@ function app_install($uid,$app) {
dbesc($x['app_id']),
intval($uid)
);
if($r)
if($r) {
if(! $r[0]['app_system']) {
if($app['categories'] && (! $app['term'])) {
$r[0]['term'] = q("select * from term where otype = %d and oid = d",
intval(TERM_OBJ_APP),
intval($r[0]['id'])
);
build_sync_packet($uid,array('app' => $r[0]));
}
}
}
return $x['app_id'];
}
return false;
@ -291,17 +332,30 @@ function app_destroy($uid,$app) {
dbesc($app['guid']),
intval($uid)
);
if($x) {
$x[0]['app_deleted'] = 1;
q("delete from term where otype = %d and oid = %d",
intval(TERM_OBJ_APP),
intval($x[0]['id'])
);
if($x[0]['app_system']) {
$r = q("update app set app_deleted = 1 where app_id = '%s' and app_channel = %d",
dbesc($app['guid']),
intval($uid)
);
}
else {
$r = q("delete from app where app_id = '%s' and app_channel = %d",
dbesc($app['guid']),
intval($uid)
);
// we don't sync system apps - they may be completely different on the other system
build_sync_packet($uid,array('app' => $x));
}
}
}
}
function app_installed($uid,$app) {
@ -316,13 +370,40 @@ function app_installed($uid,$app) {
}
function app_list($uid) {
$r = q("select * from app where app_channel = %d order by app_name asc",
function app_list($uid, $deleted = false, $cat = '') {
if($deleted)
$sql_extra = " and app_deleted = 1 ";
else
$sql_extra = " and app_deleted = 0 ";
if($cat) {
$r = q("select oid from term where otype = %d and term = '%s'",
intval(TERM_OBJ_APP),
dbesc($cat)
);
if(! $r)
return $r;
$sql_extra .= " and app.id in ( ";
$s = '';
foreach($r as $rr) {
if($s)
$s .= ',';
$s .= intval($rr['oid']);
}
$sql_extra .= $s . ') ';
}
$r = q("select * from app where app_channel = %d $sql_extra order by app_name asc",
intval($uid)
);
if($r) {
for($x = 0; $x < count($r); $x ++) {
if(! $r[$x]['app_system'])
$r[$x]['type'] = 'personal';
$r[$x]['term'] = q("select * from term where otype = %d and oid = %d",
intval(TERM_OBJ_APP),
intval($r[$x]['id'])
);
}
}
return($r);
@ -365,10 +446,12 @@ function app_store($arr) {
$darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : '');
$darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
$darray['app_system'] = ((x($arr,'system')) ? intval($arr['system']) : 0);
$darray['app_deleted'] = ((x($arr,'deleted')) ? intval($arr['deleted']) : 0);
$created = datetime_convert();
$r = q("insert into app ( app_id, app_sig, app_author, app_name, app_desc, app_url, app_photo, app_version, app_channel, app_addr, app_price, app_page, app_requires, app_created, app_edited ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s' )",
$r = q("insert into app ( app_id, app_sig, app_author, app_name, app_desc, app_url, app_photo, app_version, app_channel, app_addr, app_price, app_page, app_requires, app_created, app_edited, app_system, app_deleted ) values ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
dbesc($darray['app_id']),
dbesc($darray['app_sig']),
dbesc($darray['app_author']),
@ -383,12 +466,30 @@ function app_store($arr) {
dbesc($darray['app_page']),
dbesc($darray['app_requires']),
dbesc($created),
dbesc($created)
dbesc($created),
intval($darray['app_system']),
intval($darray['app_deleted'])
);
if($r) {
$ret['success'] = true;
$ret['app_id'] = $darray['app_id'];
}
if($arr['categories']) {
$x = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($darray['app_id']),
intval($darray['app_channel'])
);
$y = explode(',',$arr['categories']);
if($y) {
foreach($y as $t) {
$t = trim($t);
if($t) {
store_item_tag($darray['app_channel'],$x[0]['id'],TERM_OBJ_APP,TERM_CATEGORY,escape_tags($t),escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
}
}
}
}
return $ret;
}
@ -420,10 +521,12 @@ function app_update($arr) {
$darray['app_price'] = ((x($arr,'price')) ? escape_tags($arr['price']) : '');
$darray['app_page'] = ((x($arr,'page')) ? escape_tags($arr['page']) : '');
$darray['app_requires'] = ((x($arr,'requires')) ? escape_tags($arr['requires']) : '');
$darray['app_system'] = ((x($arr,'system')) ? intval($arr['system']) : 0);
$darray['app_deleted'] = ((x($arr,'deleted')) ? intval($arr['deleted']) : 0);
$edited = datetime_convert();
$r = q("update app set app_sig = '%s', app_author = '%s', app_name = '%s', app_desc = '%s', app_url = '%s', app_photo = '%s', app_version = '%s', app_addr = '%s', app_price = '%s', app_page = '%s', app_requires = '%s', app_edited = '%s' where app_id = '%s' and app_channel = %d",
$r = q("update app set app_sig = '%s', app_author = '%s', app_name = '%s', app_desc = '%s', app_url = '%s', app_photo = '%s', app_version = '%s', app_addr = '%s', app_price = '%s', app_page = '%s', app_requires = '%s', app_edited = '%s', app_system = %d, app_deleted = %d where app_id = '%s' and app_channel = %d",
dbesc($darray['app_sig']),
dbesc($darray['app_author']),
dbesc($darray['app_name']),
@ -436,6 +539,8 @@ function app_update($arr) {
dbesc($darray['app_page']),
dbesc($darray['app_requires']),
dbesc($edited),
intval($darray['app_system']),
intval($darray['app_deleted']),
dbesc($darray['app_id']),
intval($darray['app_channel'])
);
@ -444,6 +549,28 @@ function app_update($arr) {
$ret['app_id'] = $darray['app_id'];
}
$x = q("select id from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($darray['app_id']),
intval($darray['app_channel'])
);
if($x) {
q("delete from term where otype = %d and oid = %d",
intval(TERM_OBJ_APP),
intval($x[0]['id'])
);
if($arr['categories']) {
$y = explode(',',$arr['categories']);
if($y) {
foreach($y as $t) {
$t = trim($t);
if($t) {
store_item_tag($darray['app_channel'],$x[0]['id'],TERM_OBJ_APP,TERM_CATEGORY,escape_tags($t),escape_tags(z_root() . '/apps/?f=&cat=' . escape_tags($t)));
}
}
}
}
}
return $ret;
}
@ -494,9 +621,29 @@ function app_encode($app,$embed = false) {
if($app['app_requires'])
$ret['requires'] = $app['app_requires'];
if($app['app_system'])
$ret['system'] = $app['app_system'];
if($app['app_deleted'])
$ret['deleted'] = $app['app_deleted'];
if($app['term']) {
$s = '';
foreach($app['term'] as $t) {
if($s)
$s .= ',';
$s .= $t['term'];
}
$ret['categories'] = $s;
}
if(! $embed)
return $ret;
if(array_key_exists('categories',$ret))
unset($ret['categories']);
$j = json_encode($ret);
return '[app]' . chunk_split(base64_encode($j),72,"\n") . '[/app]';

2
include/contact_widgets.php
View File

@ -79,12 +79,14 @@ function categories_widget($baseurl,$selected = '') {
where item.uid = %d
and term.uid = item.uid
and term.type = %d
and term.otype = %d
and item.owner_xchan = '%s'
and item.item_wall = 1
$item_normal
order by term.term asc",
intval(App::$profile['profile_uid']),
intval(TERM_CATEGORY),
intval(TERM_OBJ_POST),
dbesc(App::$profile['channel_hash'])
);
if($r && count($r)) {

11
include/identity.php
View File

@ -580,11 +580,18 @@ function identity_basic_export($channel_id, $items = false) {
if($r)
$ret['obj'] = $r;
$r = q("select * from app where app_channel = %d",
$r = q("select * from app where app_channel = %d and app_system = 0",
intval($channel_id)
);
if($r)
if($r) {
for($x = 0; $x < count($r); $x ++) {
$r[$x]['term'] = q("select * from term where otype = %d and oid = %d",
intval(TERM_OBJ_APP),
intval($r[$x]['id'])
);
}
$ret['app'] = $r;
}
$r = q("select * from chatroom where cr_uid = %d",
intval($channel_id)

71
include/import.php
View File

@ -297,8 +297,11 @@ function import_apps($channel,$apps) {
if($channel && $apps) {
foreach($apps as $app) {
$term = ((array_key_exists('term',$app) && is_array($app['term'])) ? $app['term'] : null);
unset($app['id']);
unset($app['app_channel']);
unset($app['term']);
$app['app_channel'] = $channel['channel_id'];
@ -307,6 +310,8 @@ function import_apps($channel,$apps) {
$app['app_photo'] = $x[0];
}
$hash = $app['app_id'];
dbesc_array($app);
$r = dbq("INSERT INTO app (`"
. implode("`, `", array_keys($app))
@ -314,6 +319,21 @@ function import_apps($channel,$apps) {
. implode("', '", array_values($app))
. "')"
);
if($term) {
$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($hash),
intval($channel['channel_id'])
);
if($x) {
foreach($term as $t) {
store_item_tag($channel['channel_id'],$x[0]['id'],TERM_OBJ_APP,$t['type'],escape_tags($t['term']),escape_tags($t['url']));
}
}
}
}
}
}
@ -325,16 +345,41 @@ function sync_apps($channel,$apps) {
if($channel && $apps) {
foreach($apps as $app) {
$exists = false;
$term = ((array_key_exists('term',$app)) ? $app['term'] : null);
$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($app['app_id']),
intval($channel['channel_id'])
);
if($x) {
$exists = $x[0];
}
if(array_key_exists('app_deleted',$app) && $app['app_deleted'] && $app['app_id']) {
q("delete from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($app['app_id']),
intval($channel['channel_id'])
);
if($exists) {
q("delete from term where otype = %d and oid = %d",
intval(TERM_OBJ_APP),
intval($exists['id'])
);
}
continue;
}
unset($app['id']);
unset($app['app_channel']);
unset($app['term']);
if($exists) {
q("delete from term where otype = %d and oid = %d",
intval(TERM_OBJ_APP),
intval($exists['id'])
);
}
if(! $app['app_created'] || $app['app_created'] === NULL_DATE)
$app['app_created'] = datetime_convert();
@ -348,16 +393,15 @@ function sync_apps($channel,$apps) {
$app['app_photo'] = $x[0];
}
$exists = false;
if($exists && $term) {
foreach($term as $t) {
store_item_tag($channel['channel_id'],$exists['id'],TERM_OBJ_APP,$t['type'],escape_tags($t['term']),escape_tags($t['url']));
}
}
$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($app['app_id']),
intval($channel['channel_id'])
);
if($x) {
if($x[0]['app_edited'] >= $app['app_edited'])
if($exists) {
if($exists['app_edited'] >= $app['app_edited'])
continue;
$exists = true;
}
$hash = $app['app_id'];
@ -380,6 +424,17 @@ function sync_apps($channel,$apps) {
. implode("', '", array_values($app))
. "')"
);
if($term) {
$x = q("select * from app where app_id = '%s' and app_channel = %d limit 1",
dbesc($hash),
intval($channel['channel_id'])
);
if($x) {
foreach($term as $t) {
store_item_tag($channel['channel_id'],$x[0]['id'],TERM_OBJ_APP,$t['type'],escape_tags($t['term']),escape_tags($t['url']));
}
}
}
}
}
}

90
include/taxonomy.php
View File

@ -156,47 +156,16 @@ function tagadelic($uid, $count = 0, $authors = '', $owner = '', $flags = 0, $re
if(! $r)
return array();
// Find minimum and maximum log-count.
$tags = array();
$min = 1e9;
$max = -1e9;
return Zotlabs\Text\Tagadelic::calc($r);
$x = 0;
foreach($r as $rr) {
$tags[$x][0] = $rr['term'];
$tags[$x][1] = log($rr['total']);
$tags[$x][2] = 0;
$min = min($min,$tags[$x][1]);
$max = max($max,$tags[$x][1]);
$x ++;
}
usort($tags,'tags_sort');
$range = max(.01, $max - $min) * 1.0001;
for($x = 0; $x < count($tags); $x ++) {
$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
}
return $tags;
}
function tags_sort($a,$b) {
if(strtolower($a[0]) == strtolower($b[0]))
return 0;
return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
}
function dir_tagadelic($count = 0) {
$count = intval($count);
// Fetch tags
$r = q("select xtag_term, count(xtag_term) as total from xtag where xtag_flags = 0
$r = q("select xtag_term as term, count(xtag_term) as total from xtag where xtag_flags = 0
group by xtag_term order by total desc %s",
((intval($count)) ? "limit $count" : '')
);
@ -204,30 +173,49 @@ function dir_tagadelic($count = 0) {
if(! $r)
return array();
// Find minimum and maximum log-count.
$tags = array();
$min = 1e9;
$max = -1e9;
$x = 0;
return Zotlabs\Text\Tagadelic::calc($r);
}
function app_tagblock($link,$count = 0) {
$o = '';
$r = app_tagadelic($count);
if($r) {
$o = '<div class="tagblock widget"><h3>' . t('Categories') . '</h3><div class="tags" align="center">';
foreach($r as $rr) {
$tags[$x][0] = $rr['xtag_term'];
$tags[$x][1] = log($rr['total']);
$tags[$x][2] = 0;
$min = min($min,$tags[$x][1]);
$max = max($max,$tags[$x][1]);
$x ++;
$o .= '<a href="'.$link .'/' . '?f=&cat=' . urlencode($rr[0]).'" class="tag'.$rr[2].'">'.$rr[0].'</a> ' . "\r\n";
}
$o .= '</div></div>';
}
usort($tags,'tags_sort');
$range = max(.01, $max - $min) * 1.0001;
for($x = 0; $x < count($tags); $x ++) {
$tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range);
return $o;
}
return $tags;
function app_tagadelic($count = 0) {
if(! local_channel())
return '';
$count = intval($count);
// Fetch tags
$r = q("select term, count(term) as total from term left join app on term.uid = app_channel where term.uid = %d
and term.otype = %d group by term order by total desc %s",
intval(local_channel()),
intval(TERM_OBJ_APP),
((intval($count)) ? "limit $count" : '')
);
if(! $r)
return array();
return Zotlabs\Text\Tagadelic::calc($r);
}

53
include/widgets.php
View File

@ -103,8 +103,8 @@ function widget_appselect($arr) {
'$system' => t('System'),
'$authed' => ((local_channel()) ? true : false),
'$personal' => t('Personal'),
'$new' => t('Create Personal App'),
'$edit' => t('Edit Personal App')
'$new' => t('New App'),
'$edit' => t('Edit App')
));
}
@ -400,6 +400,55 @@ function widget_categories($arr) {
}
function widget_appcategories($arr) {
if(! local_channel())
return '';
$cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat'],ENT_COMPAT,'UTF-8') : '');
$srchurl = App::$query_string;
$srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&');
$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
$terms = array();
$r = q("select distinct(term.term)
from term join app on term.oid = app.id
where app_channel = %d
and term.uid = app_channel
and term.otype = %d
order by term.term asc",
intval(local_channel()),
intval(TERM_OBJ_APP)
);
if($r) {
foreach($r as $rr)
$terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : ''));
return replace_macros(get_markup_template('categories_widget.tpl'),array(
'$title' => t('Categories'),
'$desc' => '',
'$sel_all' => (($selected == '') ? 'selected' : ''),
'$all' => t('Everything'),
'$terms' => $terms,
'$base' => $srchurl,
));
}
}
function widget_appcloud($arr) {
if(! local_channel())
return '';
return app_tagblock(z_root() . '/apps');
}
function widget_tagcloud_wall($arr) {

4
install/schema_mysql.sql
View File

@ -123,6 +123,8 @@ CREATE TABLE IF NOT EXISTS `app` (
`app_price` char(255) NOT NULL DEFAULT '',
`app_page` char(255) NOT NULL DEFAULT '',
`app_requires` char(255) NOT NULL DEFAULT '',
`app_deleted` int(11) NOT NULL DEFAULT '0',
`app_system` int(11) NOT NULL DEFAULT '0',
`app_created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`app_edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
PRIMARY KEY (`id`),
@ -134,6 +136,8 @@ CREATE TABLE IF NOT EXISTS `app` (
KEY `app_channel` (`app_channel`),
KEY `app_price` (`app_price`),
KEY `app_created` (`app_created`),
KEY `app_deleted` (`app_deleted`),
KEY `app_system` (`app_system`),
KEY `app_edited` (`app_edited`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

4
install/schema_postgres.sql
View File

@ -120,6 +120,8 @@ CREATE TABLE "app" (
"app_price" text NOT NULL DEFAULT '',
"app_page" text NOT NULL DEFAULT '',
"app_requires" text NOT NULL DEFAULT '',
"app_deleted" smallint NOT NULL DEFAULT '0',
"app_system" smallint NOT NULL DEFAULT '0',
"app_created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
"app_edited" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
PRIMARY KEY ("id")
@ -133,6 +135,8 @@ create index "app_channel" on app ("app_channel");
create index "app_price" on app ("app_price");
create index "app_created" on app ("app_created");
create index "app_edited" on app ("app_edited");
create index "app_deleted" on app ("app_deleted");
create index "app_system" on app ("app_system");
CREATE TABLE "attach" (
"id" serial NOT NULL,
"aid" bigint NOT NULL DEFAULT '0',

19
install/update.php
View File

@ -1,6 +1,6 @@
<?php
define( 'UPDATE_VERSION' , 1167 );
define( 'UPDATE_VERSION' , 1168 );
/**
*
@ -2079,4 +2079,21 @@ function update_r1166() {
return UPDATE_FAILED;
}
function update_r1167() {
$r1 = q("alter table app add app_deleted int not null default '0' ");
$r2 = q("alter table app add app_system int not null default '0' ");
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
$r3 = q("create index \"app_deleted_idx\" on app (\"app_deleted\") ");
$r4 = q("create index \"app_system_idx\" on app (\"app_system\") ");
}
else {
$r3 = q("alter table app add index ( app_deleted ) ");
$r4 = q("alter table app add index ( app_system ) ");
}
if($r1 && $r2 && $r3 && $r4)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
}

33
view/js/acl.js
View File

@ -16,6 +16,7 @@ function ACL(backend_url, preset) {
that.list_content = $("#acl-list-content");
that.item_tpl = unescape($(".acl-list-item[rel=acl-template]").html());
that.showall = $("#acl-showall");
that.showlimited = $("#acl-showlimited");
// set the initial ACL lists in case the enclosing form gets submitted before the ajax loader completes.
that.on_submit();
@ -26,6 +27,7 @@ function ACL(backend_url, preset) {
$(document).ready(function() {
that.showall.click(that.on_showall);
that.showlimited.click(that.on_showlimited);
$(document).on('click','.acl-button-show',that.on_button_show);
$(document).on('click','.acl-button-hide',that.on_button_hide);
$("#acl-search").keypress(that.on_search);
@ -71,7 +73,8 @@ ACL.prototype.on_search = function(event) {
};
ACL.prototype.on_showall = function(event) {
event.preventDefault();
// preventDefault() isn't called here as we want state changes from update_view() to be applied to the radiobutton
event.stopPropagation();
if (that.showall.hasClass("btn-warning")) {
@ -87,9 +90,17 @@ ACL.prototype.on_showall = function(event) {
that.update_view();
that.on_submit();
return false;
return true; // return true so that state changes from update_view() will be applied
};
ACL.prototype.on_showlimited = function(event) {
// Prevent the radiobutton from being selected, as the showlimited radiobutton
// option is selected only by selecting show or hide options on channels or groups.
event.preventDefault();
event.stopPropagation();
return false;
}
ACL.prototype.on_selectall = function(event) {
event.preventDefault();
event.stopPropagation();
@ -188,18 +199,32 @@ ACL.prototype.set_deny = function(itemid) {
that.update_view();
};
ACL.prototype.update_radiobuttons = function(isPublic) {
that.showall.prop('checked', isPublic);
that.showlimited.prop('checked', !isPublic);
that.showlimited.prop('disabled', isPublic);
};
ACL.prototype.update_view = function() {
if (that.allow_gid.length === 0 && that.allow_cid.length === 0 &&
that.deny_gid.length === 0 && that.deny_cid.length === 0) {
// btn-warning indicates that the permissions are public, it was chosen because
// that.showall used to be a normal button, which btn-warning is a bootstrap style for.
that.showall.removeClass("btn-default").addClass("btn-warning");
that.update_radiobuttons(true);
/* jot acl */
$('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
} else {
that.showall.removeClass("btn-warning").addClass("btn-default");
that.update_radiobuttons(false);
/* jot acl */
$('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
$('.profile-jot-net input').attr('disabled', 'disabled');

1
view/pdl/mod_apps.pdl
View File

@ -1,3 +1,4 @@
[region=aside]
[widget=appselect][/widget]
[widget=appcategories][/widget]
[/region]

67
view/theme/redbasic/css/style.css
View File

@ -912,19 +912,52 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
clear: both;
}
.modal-header .contextual-help-tool {
/* Mostly duplicating ".modal-header .close" and ".close" layout settings from bootstrap */
float: right;
font-size: 21px;
padding: 0;
margin-top: -4px;
margin-right: 15px;
line-height: 1;
}
#acl-search {
margin-top: 20px;
padding: 8px;
padding: 4px;
border: 1px solid #ccc;
width: 100%;
width: 90%; /* fallback if browser does not support calc() */
width: calc(100% - 10px);
margin: 0px 0px 10px 10px;
}
#acl-search::-webkit-input-placeholder {
font-family: FontAwesome;
/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
font-family: FontAwesome, sans-serif, arial, freesans;
}
#acl-search::-moz-placeholder {
font-family: FontAwesome;
/* non-fontawesome fonts set a fallback for text parts of the placeholder*/
font-family: FontAwesome, sans-serif, arial, freesans;
}
#aclModal .modal-body {
padding-top: 10px;
}
#acl-dialog-description {
font-size: 90%;
color: #888;
padding-bottom: 4px;
}
#acl-dialog-description b {
color: black;
}
#acl-showlimited-description {
font-size: 90%;
color: #888;
margin-left: 10px;
margin-bottom: 4px;
}
#acl-list {
@ -933,11 +966,11 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
overflow: auto;
clear: both;
min-height: 62px;
margin-top: 20px;
padding: 10px 10px 0px 0px;
-webkit-border-radius: $radiuspx ;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
background-color: rgb(238,238,238);
}
#jotnets-wrapper, #jotnets-collapse {
@ -957,6 +990,7 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
-webkit-border-radius: $radiuspx ;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
background-color: white;
}
.acl-list-item.grouphide {
@ -995,6 +1029,27 @@ a.rconnect:hover, a.rateme:hover, div.rateme:hover {
margin-left: 5px;
}
#acl-showlimited-caption,
#acl-showall-caption {
font-size: 115%;
}
#acl-radiowrapper-showall {
margin-top: 20px;
margin-bottom: 20px;
}
#acl-radiowrapper-showlimited {
margin-bottom: 0;
}
#acl-showall + i {
font-size: 140%;
}
#acl-showall-caption {
margin-left: 0.35em;
}
.contact-block-content {
margin-top: 10px;
}

25
view/tpl/acl_selector.tpl
View File

@ -3,9 +3,15 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{{$aclModalTitle}}</h4>
{{if $helpUrl}}
<a type="button" target="hubzilla-help" href="{{$helpUrl}}" class="contextual-help-tool" title="Help and documentation"><i class="fa fa-question"></i></a>
{{/if}}
<h4 class="modal-title"><i id="dialog-perms-icon" class="fa fa-fw"></i> {{$aclModalTitle}}</h4>
</div>
<div class="modal-body">
{{if $aclModalDesc}}
<div id="acl-dialog-description">{{$aclModalDesc}}</div>
{{/if}}
{{if $jotnets}}
<div class="jotnets-wrapper" role="tab" id="jotnets-wrapper">
<a data-toggle="collapse" class="btn btn-block btn-default" href="#jotnets-collapse" aria-expanded="false" aria-controls="jotnets-collapse">{{$jnetModalTitle}} <span class="caret"></span></a>
@ -16,11 +22,24 @@
</div>
{{/if}}
<div id="acl-wrapper">
<button id="acl-showall" class="btn btn-block btn-default"><i class="fa fa-globe"></i> {{$showall}}</button>
<input type="text" id="acl-search" placeholder="&#xf002;">
<div id="acl-radiowrapper-showall" class="radio">
<label>
<input id="acl-showall" type="radio" name="optionsRadios" value="option1" checked>
<i class="fa fa-globe"></i><span id=acl-showall-caption>{{$showall}}</span>
</label>
</div>
<div id="acl-radiowrapper-showlimited" class="radio">
<label>
<input id="acl-showlimited" type="radio" name="optionsRadios" style="readonly" value="option2">
<span id=acl-showlimited-caption>{{$showlimited}}</span>
</label>
<div id="acl-list">
<input type="text" id="acl-search" placeholder="&#xf002; {{$search}}">
<div id=acl-showlimited-description>{{$showlimitedDesc}}</div>
<div id="acl-list-content"></div>
</div>
</div>
<span id="acl-fields"></span>
</div>

5
view/tpl/app_create.tpl
View File

@ -12,7 +12,12 @@
<input type="hidden" name="addr" value="{{$addr}}" />
{{/if}}
<input type="hidden" name="requires" value="{{$requires}}" />
<input type="hidden" name="system" value="{{$system}}" />
{{include file="field_input.tpl" field=$name}}
{{include file="field_input.tpl" field=$categories}}
{{include file="field_input.tpl" field=$url}}
{{include file="field_textarea.tpl" field=$desc}}
{{include file="field_input.tpl" field=$photo}}

4
view/tpl/app_select.tpl
View File

@ -2,8 +2,8 @@
<div class="widget">
<h3>{{$title}}</h3>
<ul class="nav nav-pills nav-stacked">
<li><a href="appman">{{$new}}</a></li>
<li><a href="apps/edit">{{$edit}}</a></li>
<li><a href="appman"><i class="fa fa-plus"></i>&nbsp;&nbsp;{{$new}}</a></li>
<li><a href="apps/edit"><i class="fa fa-pencil"></i>&nbsp;&nbsp;{{$edit}}</a></li>
</ul>
</div>
{{/if}}

2
view/tpl/myapps.tpl
View File

@ -1,5 +1,5 @@
<div class="generic-content-wrapper-styled">
<h3>{{$title}}</h3>
<h3>{{$title}}{{$cat}}</h3>
{{foreach $apps as $ap}}
{{$ap}}

2
view/tpl/sharedwithme.tpl
View File

@ -14,7 +14,7 @@
</tr>
{{foreach $items as $item}}
<tr id="cloud-index-{{$item.id}}">
<td><i class="{{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
<td><i class="fa {{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td>
<td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}}&nbsp;<span class="label label-success">{{$label_new}}</span>{{/if}}</td>
<td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td>
<td class="hidden-xs">{{$item.objfilesize}}</td>