aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-22 13:32:42 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-22 13:32:42 +0200
commit1e5405ccaf3ddff88653cc34a04cfce9b7102891 (patch)
tree784d6c5784bfcd5c637eefc3390fa6279159ee7c
parent2b452ffbd370f52122577910a8b36846d526678d (diff)
downloadvolse-hubzilla-1e5405ccaf3ddff88653cc34a04cfce9b7102891.tar.gz
volse-hubzilla-1e5405ccaf3ddff88653cc34a04cfce9b7102891.tar.bz2
volse-hubzilla-1e5405ccaf3ddff88653cc34a04cfce9b7102891.zip
appification of sources
-rw-r--r--Zotlabs/Module/Settings/Editor.php9
-rw-r--r--Zotlabs/Module/Sources.php22
-rw-r--r--app/sources.apd6
3 files changed, 21 insertions, 16 deletions
diff --git a/Zotlabs/Module/Settings/Editor.php b/Zotlabs/Module/Settings/Editor.php
index a87f31fe7..92775f154 100644
--- a/Zotlabs/Module/Settings/Editor.php
+++ b/Zotlabs/Module/Settings/Editor.php
@@ -47,15 +47,6 @@ class Editor {
],
[
- //TODO: This should be its own app
- 'channel_sources',
- t('Channel Sources'),
- t('Automatically import channel content from other channels or feeds'),
- false,
- get_config('feature_lock','channel_sources'),
- ],
-
- [
'content_encrypt',
t('Even More Encryption'),
t('Allow optional encryption of content end-to-end with a shared secret key'),
diff --git a/Zotlabs/Module/Sources.php b/Zotlabs/Module/Sources.php
index 2a2fa1835..5d05244a7 100644
--- a/Zotlabs/Module/Sources.php
+++ b/Zotlabs/Module/Sources.php
@@ -1,15 +1,18 @@
<?php
namespace Zotlabs\Module; /** @file */
+use App;
+use Zotlabs\Lib\Apps;
+use Zotlabs\Web\Controller;
-class Sources extends \Zotlabs\Web\Controller {
+class Sources extends Controller {
function post() {
if(! local_channel())
return;
- if(! feature_enabled(local_channel(),'channel_sources'))
- return '';
+ if(! Apps::system_app_installed(local_channel(), 'Channel Sources'))
+ return;
$source = intval($_REQUEST['source']);
$xchan = escape_tags($_REQUEST['xchan']);
@@ -75,12 +78,17 @@ class Sources extends \Zotlabs\Web\Controller {
function get() {
if(! local_channel()) {
notice( t('Permission denied.') . EOL);
- return '';
+ return;
}
- if(! feature_enabled(local_channel(),'channel_sources')) {
- return '';
- }
+ if(! Apps::system_app_installed(local_channel(), 'Channel Sources')) {
+ //Do not display any associated widgets at this point
+ App::$pdl = '';
+
+ $o = '<b>Sources App (Not Installed):</b><br>';
+ $o .= t('Automatically import channel content from other channels or feeds');
+ return $o;
+ }
// list sources
if(argc() == 1) {
diff --git a/app/sources.apd b/app/sources.apd
new file mode 100644
index 000000000..69dd0aac0
--- /dev/null
+++ b/app/sources.apd
@@ -0,0 +1,6 @@
+version: 1
+url: $baseurl/sources
+requires: local_channel
+name: Channel Sources
+photo: icon:commenting-o
+categories: Networking