aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Zotlabs/Module/Settings/Connections.php17
-rw-r--r--Zotlabs/Module/Settings/Editor.php17
-rw-r--r--Zotlabs/Module/Settings/Manage.php19
-rw-r--r--Zotlabs/Module/Settings/Network.php17
-rw-r--r--Zotlabs/Module/Settings/Profiles.php19
-rw-r--r--app/photos.apd4
-rw-r--r--include/features.php27
7 files changed, 75 insertions, 45 deletions
diff --git a/Zotlabs/Module/Settings/Connections.php b/Zotlabs/Module/Settings/Connections.php
index f3638862b..70b4daa42 100644
--- a/Zotlabs/Module/Settings/Connections.php
+++ b/Zotlabs/Module/Settings/Connections.php
@@ -6,9 +6,12 @@ namespace Zotlabs\Module\Settings;
class Connections {
function post() {
- check_form_security_token_redirectOnErr('/settings/connections', 'settings_connections');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module);
- $features = get_module_features('connections');
+ $features = get_module_features($module);
process_module_features_post(local_channel(), $features, $_POST);
@@ -17,16 +20,18 @@ class Connections {
}
function get() {
-
- $features = get_module_features('connections');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ $features = get_module_features($module);
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
'$rpath' => $rpath,
- '$action_url' => 'settings/connections',
- '$form_security_token' => get_form_security_token("settings_connections"),
+ '$action_url' => 'settings/' . $module,
+ '$form_security_token' => get_form_security_token('settings_' . $module),
'$title' => t('Connections Settings'),
'$features' => process_module_features_get(local_channel(), $features),
'$submit' => t('Submit')
diff --git a/Zotlabs/Module/Settings/Editor.php b/Zotlabs/Module/Settings/Editor.php
index 514417e49..93e3ce602 100644
--- a/Zotlabs/Module/Settings/Editor.php
+++ b/Zotlabs/Module/Settings/Editor.php
@@ -6,9 +6,12 @@ namespace Zotlabs\Module\Settings;
class Editor {
function post() {
- check_form_security_token_redirectOnErr('/settings/editor', 'settings_editor');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module);
- $features = get_module_features('editor');
+ $features = get_module_features($module);
process_module_features_post(local_channel(), $features, $_POST);
@@ -17,16 +20,18 @@ class Editor {
}
function get() {
-
- $features = get_module_features('editor');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ $features = get_module_features($module);
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
'$rpath' => $rpath,
- '$action_url' => 'settings/editor',
- '$form_security_token' => get_form_security_token("settings_editor"),
+ '$action_url' => 'settings/' . $module,
+ '$form_security_token' => get_form_security_token('settings_' . $module),
'$title' => t('Editor Settings'),
'$features' => process_module_features_get(local_channel(), $features),
'$submit' => t('Submit')
diff --git a/Zotlabs/Module/Settings/Manage.php b/Zotlabs/Module/Settings/Manage.php
index 841e58be3..15d3216e9 100644
--- a/Zotlabs/Module/Settings/Manage.php
+++ b/Zotlabs/Module/Settings/Manage.php
@@ -6,9 +6,12 @@ namespace Zotlabs\Module\Settings;
class Manage {
function post() {
- check_form_security_token_redirectOnErr('/settings/manage', 'settings_manage');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module);
- $features = get_module_features('manage');
+ $features = get_module_features($module);
process_module_features_post(local_channel(), $features, $_POST);
@@ -17,18 +20,20 @@ class Manage {
}
function get() {
-
- $features = get_module_features('manage');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ $features = get_module_features($module);
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
'$rpath' => $rpath,
- '$action_url' => 'settings/manage',
- '$form_security_token' => get_form_security_token("settings_manage"),
+ '$action_url' => 'settings/' . $module,
+ '$form_security_token' => get_form_security_token('settings_' . $module),
'$title' => t('Channel Manager Settings'),
- '$features' => process__module_features_get(local_channel(), $features),
+ '$features' => process_module_features_get(local_channel(), $features),
'$submit' => t('Submit')
));
diff --git a/Zotlabs/Module/Settings/Network.php b/Zotlabs/Module/Settings/Network.php
index bc0ba7143..c51b780f1 100644
--- a/Zotlabs/Module/Settings/Network.php
+++ b/Zotlabs/Module/Settings/Network.php
@@ -6,9 +6,12 @@ namespace Zotlabs\Module\Settings;
class Network {
function post() {
- check_form_security_token_redirectOnErr('/settings/network', 'settings_network');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module);
- $features = get_module_features('network');
+ $features = get_module_features($module);
process_module_features_post(local_channel(), $features, $_POST);
@@ -17,16 +20,18 @@ class Network {
}
function get() {
-
- $features = get_module_features('network');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ $features = get_module_features($module);
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
'$rpath' => $rpath,
- '$action_url' => 'settings/network',
- '$form_security_token' => get_form_security_token("settings_network"),
+ '$action_url' => 'settings/' . $module,
+ '$form_security_token' => get_form_security_token('settings_' . $module),
'$title' => t('Activity Settings'),
'$features' => process_module_features_get(local_channel(), $features),
'$submit' => t('Submit')
diff --git a/Zotlabs/Module/Settings/Profiles.php b/Zotlabs/Module/Settings/Profiles.php
index a22a540da..78dc0160e 100644
--- a/Zotlabs/Module/Settings/Profiles.php
+++ b/Zotlabs/Module/Settings/Profiles.php
@@ -6,9 +6,12 @@ namespace Zotlabs\Module\Settings;
class Profiles {
function post() {
- check_form_security_token_redirectOnErr('/settings/profiles', 'settings_profiles');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ check_form_security_token_redirectOnErr('/settings/' . $module, 'settings_' . $module);
- $features = get_module_features('profiles');
+ $features = get_module_features($module);
process_module_features_post(local_channel(), $features, $_POST);
@@ -17,17 +20,19 @@ class Profiles {
}
function get() {
-
- $features = get_module_features('profiles');
+
+ $module = substr(strrchr(strtolower(static::class), '\\'), 1);
+
+ $features = get_module_features($module);
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array(
'$rpath' => $rpath,
- '$action_url' => 'settings/profiles',
- '$form_security_token' => get_form_security_token("settings_profiles"),
- '$title' => t('Profile Settings'),
+ '$action_url' => 'settings/' . $module,
+ '$form_security_token' => get_form_security_token('settings_' . $module),
+ '$title' => t('Profiles Settings'),
'$features' => process_module_features_get(local_channel(), $features),
'$submit' => t('Submit')
));
diff --git a/app/photos.apd b/app/photos.apd
index 048e623bb..09b4eb0fd 100644
--- a/app/photos.apd
+++ b/app/photos.apd
@@ -1,5 +1,5 @@
-version: 1
-url: $baseurl/photos/$nick
+version: 1.1
+url: $baseurl/photos/$nick, $baseurl/settings/photos
requires: local_channel
name: Photos
photo: icon:photo
diff --git a/include/features.php b/include/features.php
index 6f6aa88dc..b7d6c0ceb 100644
--- a/include/features.php
+++ b/include/features.php
@@ -105,15 +105,6 @@ function get_features($filtered = true, $level = (-1)) {
],
[
- 'photo_location',
- t('Photo Location'),
- t('If location data is available on uploaded photos, link this to a map.'),
- false,
- get_config('feature_lock','photo_location'),
- feature_level('photo_location',2),
- ],
-
- [
'smart_birthdays',
t('Smart Birthdays'),
t('Make birthday events timezone aware in case your friends are scattered across the planet.'),
@@ -369,7 +360,7 @@ function get_features($filtered = true, $level = (-1)) {
'manage' => [
- t('Channel Manager'),
+ t('Manage'),
[
'nav_channel_select',
@@ -383,7 +374,7 @@ function get_features($filtered = true, $level = (-1)) {
'network' => [
- t('Activity'),
+ t('Network'),
[
'archives',
@@ -451,6 +442,20 @@ function get_features($filtered = true, $level = (-1)) {
],
+ 'photos' => [
+
+ t('Photos'),
+
+ [
+ 'photo_location',
+ t('Photo Location'),
+ t('If location data is available on uploaded photos, link this to a map.'),
+ false,
+ get_config('feature_lock','photo_location'),
+ ]
+
+ ],
+
'profiles' => [
t('Profiles'),
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 11:31:50 +0000