parent
05ae18d74e
commit
0558a25141
@ -306,7 +306,7 @@ class Apps {
|
|||||||
'Cards' => t('Cards'),
|
'Cards' => t('Cards'),
|
||||||
'Admin' => t('Site Admin'),
|
'Admin' => t('Site Admin'),
|
||||||
'Report Bug' => t('Report Bug'),
|
'Report Bug' => t('Report Bug'),
|
||||||
'View Bookmarks' => t('View Bookmarks'),
|
'Bookmarks' => t('Bookmarks'),
|
||||||
'Chatrooms' => t('Chatrooms'),
|
'Chatrooms' => t('Chatrooms'),
|
||||||
'Connections' => t('Connections'),
|
'Connections' => t('Connections'),
|
||||||
'Remote Diagnostics' => t('Remote Diagnostics'),
|
'Remote Diagnostics' => t('Remote Diagnostics'),
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
namespace Zotlabs\Lib;
|
namespace Zotlabs\Lib;
|
||||||
|
|
||||||
|
use Zotlabs\Lib\Apps;
|
||||||
|
|
||||||
require_once('include/text.php');
|
require_once('include/text.php');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -272,7 +274,7 @@ class ThreadItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$has_bookmarks = false;
|
$has_bookmarks = false;
|
||||||
if(is_array($item['term'])) {
|
if(Apps::system_app_installed(local_channel(), 'Bookmarks') && is_array($item['term'])) {
|
||||||
foreach($item['term'] as $t) {
|
foreach($item['term'] as $t) {
|
||||||
if(($t['ttype'] == TERM_BOOKMARK))
|
if(($t['ttype'] == TERM_BOOKMARK))
|
||||||
$has_bookmarks = true;
|
$has_bookmarks = true;
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Zotlabs\Module;
|
namespace Zotlabs\Module;
|
||||||
|
|
||||||
|
use App;
|
||||||
|
use Zotlabs\Lib\Apps;
|
||||||
|
|
||||||
|
|
||||||
class Bookmarks extends \Zotlabs\Web\Controller {
|
class Bookmarks extends \Zotlabs\Web\Controller {
|
||||||
|
|
||||||
@ -8,7 +11,10 @@ class Bookmarks extends \Zotlabs\Web\Controller {
|
|||||||
if(! local_channel())
|
if(! local_channel())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
nav_set_selected('View Bookmarks');
|
if(! Apps::system_app_installed(local_channel(), 'Bookmarks'))
|
||||||
|
return;
|
||||||
|
|
||||||
|
nav_set_selected('Bookmarks');
|
||||||
|
|
||||||
$item_id = intval($_REQUEST['item']);
|
$item_id = intval($_REQUEST['item']);
|
||||||
$burl = trim($_REQUEST['burl']);
|
$burl = trim($_REQUEST['burl']);
|
||||||
@ -64,7 +70,15 @@ class Bookmarks extends \Zotlabs\Web\Controller {
|
|||||||
notice( t('Permission denied.') . EOL);
|
notice( t('Permission denied.') . EOL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(! Apps::system_app_installed(local_channel(), 'Bookmarks')) {
|
||||||
|
//Do not display any associated widgets at this point
|
||||||
|
App::$pdl = '';
|
||||||
|
|
||||||
|
$o = '<b>' . t('Bookmarks App') . ' (' . t('Not Installed') . '):</b><br>';
|
||||||
|
$o .= t('Bookmark links from the item dropdown and manage them');
|
||||||
|
return $o;
|
||||||
|
}
|
||||||
|
|
||||||
require_once('include/menu.php');
|
require_once('include/menu.php');
|
||||||
require_once('include/conversation.php');
|
require_once('include/conversation.php');
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
version: 1
|
version: 1.1
|
||||||
url: $baseurl/bookmarks
|
url: $baseurl/bookmarks
|
||||||
requires: local_channel
|
requires: local_channel
|
||||||
name: View Bookmarks
|
name: Bookmarks
|
||||||
photo: icon:bookmark
|
photo: icon:bookmark
|
||||||
categories: Productivity
|
categories: Productivity
|
||||||
|
Reference in New Issue
Block a user