Features to src

Move Features to class in Friendica\Content namespace. Update function calls and references.

diff --git a/boot.php b/boot.php
index 04e14ac4d3d297ce9cdd04d4a2ebca27ccd89ea6..15dfec48b84b06ba6703b760fb9ac702580c50ef 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -36,7 +36,6 @@ require_once 'include/text.php';
 require_once 'include/datetime.php';
 require_once 'include/pgettext.php';
 require_once 'include/nav.php';
-require_once 'include/features.php';
 require_once 'include/identity.php';
 require_once 'update.php';
 require_once 'include/dbstructure.php';

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 5ae30d5633f05cdd0ca6805da2ea222264eb0240..50c733e34d1c27b7d0c63992b257a9bb3fbe160f 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -1,10 +1,9 @@
 <?php
-
 /**
  * @file include/acl_selectors.php
  */
-
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
@@ -12,10 +11,8 @@ use Friendica\Object\Contact;
 
 require_once "include/contact_selectors.php";
 require_once "include/contact_widgets.php";
-require_once "include/features.php";
 require_once "mod/proxy.php";
 
-
 /**
  * @package acl_selectors
  */
@@ -380,7 +377,7 @@ function populate_acl($user = null, $show_jotnets = false) {
                '$aclModalTitle' => t('Permissions'),
                '$aclModalDismiss' => t('Close'),
                '$features' => array(
-               'aclautomention' => (feature_enabled($user['uid'], "aclautomention") ? "true" : "false")
+               'aclautomention' => (Features::isEnabled($user['uid'], "aclautomention") ? "true" : "false")
                ),
        ));
 

diff --git a/include/api.php b/include/api.php
index 12380f4b8403e6de3a7202d752f14a43fa451b78..4055f2b4ceeee6cf5e9f35a962bb4a334ba63d62 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -6,6 +6,7 @@
  * @todo Automatically detect if incoming data is HTML or BBCode
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\NotificationsManager;
@@ -5100,7 +5101,7 @@ function api_friendica_profile_show($type)
        $profileid = (x($_REQUEST, 'profile_id') ? $_REQUEST['profile_id'] : 0);
 
        // retrieve general information about profiles for user
-       $multi_profiles = feature_enabled(api_user(), 'multi_profiles');
+       $multi_profiles = Features::isEnabled(api_user(), 'multi_profiles');
        $directory = Config::get('system', 'directory');
 
        // get data of the specified profile id or all profiles of the user if not specified

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 5108eaf72390b9fec662031590ec0fba3e78e6da..af63de7672f3ec54dc1784cd588d3caee3531443 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,5 +1,8 @@
 <?php
-
+/**
+ * @file include/contact_widgets.php
+ */
+use Friendica\Content\Features;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
@@ -105,7 +108,7 @@ function networks_widget($baseurl, $selected = '') {
                return '';
        }
 
-       if (!feature_enabled(local_user(), 'networks')) {
+       if (!Features::isEnabled(local_user(), 'networks')) {
                return '';
        }
 
@@ -144,7 +147,7 @@ function fileas_widget($baseurl, $selected = '') {
                return '';
        }
 
-       if (! feature_enabled(local_user(), 'filing')) {
+       if (! Features::isEnabled(local_user(), 'filing')) {
                return '';
        }
 
@@ -178,7 +181,7 @@ function categories_widget($baseurl, $selected = '') {
 
        $a = get_app();
 
-       if (! feature_enabled($a->profile['profile_uid'], 'categories')) {
+       if (! Features::isEnabled($a->profile['profile_uid'], 'categories')) {
                return '';
        }
 

diff --git a/include/conversation.php b/include/conversation.php
index bba852e7ad6ffb534ee010972d72cbad0b140b06..b32a98426e9ea628245c4cd41e8a8d1a0b8de0bb 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -3,6 +3,7 @@
  * @file include/conversation.php
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
@@ -915,7 +916,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                '$mode' => $mode,
                '$user' => $a->user,
                '$threads' => $threads,
-               '$dropping' => ($page_dropping && feature_enabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
+               '$dropping' => ($page_dropping && Features::isEnabled(local_user(), 'multi_delete') ? t('Delete Selected Items') : False),
        ));
 
        return $o;
@@ -1305,7 +1306,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
                '$title' => $x['title'],
                '$placeholdertitle' => t('Set title'),
                '$category' => $x['category'],
-               '$placeholdercategory' => (feature_enabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''),
+               '$placeholdercategory' => (Features::isEnabled(local_user(), 'categories') ? t('Categories (comma-separated list)') : ''),
                '$wait' => t('Please wait'),
                '$permset' => t('Permission settings'),
                '$shortpermset' => t('permissions'),
@@ -1321,7 +1322,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) {
                '$lockstate' => $x['lockstate'],
                '$bang' => $x['bang'],
                '$profile_uid' => $x['profile_uid'],
-               '$preview' => ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''),
+               '$preview' => ((Features::isEnabled($x['profile_uid'],'preview')) ? t('Preview') : ''),
                '$jotplugins' => $jotplugins,
                '$notes_cid' => $notes_cid,
                '$sourceapp' => t($a->sourcename),

diff --git a/include/event.php b/include/event.php
index a0509aa0fee048261f378e18bf0b1a66c0022415..07b90f24973edcd3a2f07e020de742230c1e359d 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -899,7 +900,7 @@ function widget_events() {
         * for exporting the cal is enabled (otherwise the widget would appear for logged in users
         * on foreigen profile pages even if the widget is disabled).
         */
-       if (intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) {
+       if (intval($owner_uid) && local_user() !== $owner_uid && ! Features::isEnabled($owner_uid, "export_calendar")) {
                return;
        }
 
@@ -907,7 +908,7 @@ function widget_events() {
         * If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
         * export feature isn't enabled.
         */
-       if (intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) {
+       if (intval($owner_uid) && ! local_user() && ! Features::isEnabled($owner_uid, "export_calendar")) {
                return;
        }
 

diff --git a/include/features.php b/include/features.php
deleted file mode 100644 (file)
index e03dc4a..0000000
--- a/include/features.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/**
- * @file include/features.php
- * @brief Features management
- */
-
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-
-/**
- * @brief check if feature is enabled
- *
- * @return boolean
- */
-function feature_enabled($uid, $feature) {
-       $x = Config::get('feature_lock', $feature, false);
-
-       if ($x === false) {
-               $x = PConfig::get($uid, 'feature', $feature, false);
-       }
-       if ($x === false) {
-               $x = Config::get('feature', $feature, false);
-       }
-       if ($x === false) {
-               $x = get_feature_default($feature);
-       }
-
-       $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
-       call_hooks('feature_enabled',$arr);
-       return($arr['enabled']);
-}
-
-/**
- * @brief check if feature is enabled or disabled by default
- *
- * @param string $feature
- * @return boolean
- */
-function get_feature_default($feature) {
-       $f = get_features();
-       foreach ($f as $cat) {
-               foreach ($cat as $feat) {
-                       if (is_array($feat) && $feat[0] === $feature)
-                               return $feat[3];
-               }
-       }
-       return false;
-}
-
-/**
- * @brief Get a list of all available features
- *
- * The array includes the setting group, the setting name,
- * explainations for the setting and if it's enabled or disabled
- * by default
- *
- * @param bool $filtered True removes any locked features
- *
- * @return array
- */
-function get_features($filtered = true) {
-
-       $arr = array(
-
-               // General
-               'general' => array(
-                       t('General Features'),
-                       //array('expire',         t('Content Expiration'),              t('Remove old posts/comments after a period of time')),
-                       array('multi_profiles', t('Multiple Profiles'),                 t('Ability to create multiple profiles'), false, Config::get('feature_lock','multi_profiles', false)),
-                       array('photo_location', t('Photo Location'),                    t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'), false, Config::get('feature_lock','photo_location', false)),
-                       array('export_calendar', t('Export Public Calendar'),           t('Ability for visitors to download the public calendar'), false, Config::get('feature_lock','export_calendar', false)),
-               ),
-
-               // Post composition
-               'composition' => array(
-                       t('Post Composition Features'),
-                       array('preview',        t('Post Preview'),                      t('Allow previewing posts and comments before publishing them'), false, Config::get('feature_lock','preview', false)),
-                       array('aclautomention', t('Auto-mention Forums'),               t('Add/remove mention when a forum page is selected/deselected in ACL window.'), false, Config::get('feature_lock','aclautomention', false)),
-               ),
-
-               // Network sidebar widgets
-               'widgets' => array(
-                       t('Network Sidebar Widgets'),
-                       array('archives',       t('Search by Date'),                    t('Ability to select posts by date ranges'), false, Config::get('feature_lock','archives', false)),
-                       array('forumlist_widget', t('List Forums'),                     t('Enable widget to display the forums your are connected with'), true, Config::get('feature_lock','forumlist_widget', false)),
-                       array('groups',         t('Group Filter'),                      t('Enable widget to display Network posts only from selected group'), false, Config::get('feature_lock','groups', false)),
-                       array('networks',       t('Network Filter'),                    t('Enable widget to display Network posts only from selected network'), false, Config::get('feature_lock','networks', false)),
-                       array('savedsearch',    t('Saved Searches'),                    t('Save search terms for re-use'), false, Config::get('feature_lock','savedsearch', false)),
-               ),
-
-               // Network tabs
-               'net_tabs' => array(
-                       t('Network Tabs'),
-                       array('personal_tab',   t('Network Personal Tab'),              t('Enable tab to display only Network posts that you\'ve interacted on'), false, Config::get('feature_lock','personal_tab', false)),
-                       array('new_tab',        t('Network New Tab'),                   t('Enable tab to display only new Network posts (from the last 12 hours)'), false, Config::get('feature_lock','new_tab', false)),
-                       array('link_tab',       t('Network Shared Links Tab'),          t('Enable tab to display only Network posts with links in them'), false, Config::get('feature_lock','link_tab', false)),
-               ),
-
-               // Item tools
-               'tools' => array(
-                       t('Post/Comment Tools'),
-                       array('multi_delete',   t('Multiple Deletion'),                 t('Select and delete multiple posts/comments at once'), false, Config::get('feature_lock','multi_delete', false)),
-                       array('edit_posts',     t('Edit Sent Posts'),                   t('Edit and correct posts and comments after sending'), false, Config::get('feature_lock','edit_posts', false)),
-                       array('commtag',        t('Tagging'),                           t('Ability to tag existing posts'), false, Config::get('feature_lock','commtag', false)),
-                       array('categories',     t('Post Categories'),                   t('Add categories to your posts'), false, Config::get('feature_lock','categories', false)),
-                       array('filing',         t('Saved Folders'),                     t('Ability to file posts under folders'), false, Config::get('feature_lock','filing', false)),
-                       array('dislike',        t('Dislike Posts'),                     t('Ability to dislike posts/comments'), false, Config::get('feature_lock','dislike', false)),
-                       array('star_posts',     t('Star Posts'),                        t('Ability to mark special posts with a star indicator'), false, Config::get('feature_lock','star_posts', false)),
-                       array('ignore_posts',   t('Mute Post Notifications'),           t('Ability to mute notifications for a thread'), false, Config::get('feature_lock','ignore_posts', false)),
-               ),
-
-               // Advanced Profile Settings
-               'advanced_profile' => array(
-                       t('Advanced Profile Settings'),
-                       array('forumlist_profile', t('List Forums'),                    t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile', false)),
-                       array('tagadelic',      t('Tag Cloud'),                         t('Provide a personal tag cloud on your profile page'), false, Config::get('feature_lock', 'tagadelic', false)),
-               ),
-       );
-
-       // removed any locked features and remove the entire category if this makes it empty
-
-       if ($filtered) {
-               foreach ($arr as $k => $x) {
-                       $has_items = false;
-                       $kquantity = count($arr[$k]);
-                       for ($y = 0; $y < $kquantity; $y ++) {
-                               if (is_array($arr[$k][$y])) {
-                                       if ($arr[$k][$y][4] === false) {
-                                               $has_items = true;
-                                       } else {
-                                               unset($arr[$k][$y]);
-                                       }
-                               }
-                       }
-                       if (! $has_items) {
-                               unset($arr[$k]);
-                       }
-               }
-       }
-
-       call_hooks('get_features',$arr);
-       return $arr;
-}

diff --git a/include/identity.php b/include/identity.php
index 3066b71130fca3b3746bfe53dbd870f989b4ec45..a12d28d1d73ffcaa90bfb549a107b9395a1d071a 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -309,7 +310,7 @@ function profile_sidebar($profile, $block = 0)
        }
 
        // show edit profile to yourself
-       if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(), 'multi_profiles')) {
+       if (!$is_contact && $profile['uid'] == local_user() && Features::isEnabled(local_user(), 'multi_profiles')) {
                $profile['edit'] = array(System::baseUrl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
                $r = q(
                        "SELECT * FROM `profile` WHERE `uid` = %d",
@@ -336,7 +337,7 @@ function profile_sidebar($profile, $block = 0)
                        }
                }
        }
-       if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(), 'multi_profiles')) {
+       if (!$is_contact && $profile['uid'] == local_user() && !Features::isEnabled(local_user(), 'multi_profiles')) {
                $profile['edit'] = array(System::baseUrl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
                $profile['menu'] = array(
                        'chg_photo' => t('Change profile photo'),
@@ -790,7 +791,7 @@ function advanced_profile(App $a)
                }
 
                //show subcribed forum if it is enabled in the usersettings
-               if (feature_enabled($uid, 'forumlist_profile')) {
+               if (Features::isEnabled($uid, 'forumlist_profile')) {
                        $profile['forumlist'] = array( t('Forums:'), ForumManager::profileAdvanced($uid));
                }
 

diff --git a/include/items.php b/include/items.php
index 98149dea591e4fd3011d65718c24aadb6b5d6c1a..22df8090768e02c6aa7e4c3b5f3b216c177f2d75 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -4,6 +4,7 @@
  */
 use Friendica\App;
 use Friendica\ParseUrl;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
@@ -2355,7 +2356,7 @@ function posted_dates($uid, $wall) {
 function posted_date_widget($url, $uid, $wall) {
        $o = '';
 
-       if (! feature_enabled($uid, 'archives')) {
+       if (! Features::isEnabled($uid, 'archives')) {
                return $o;
        }
 

diff --git a/include/nav.php b/include/nav.php
index 411f0ac5da5c28d1341d9d3e43165b11385b01d3..2de1a15606ee046e570c94cb509bf1766e5bee8b 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,9 @@
 <?php
-
+/**
+ * @file include/nav.php
+ */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -190,7 +193,7 @@ function nav_info(App $a)
 
                $nav['settings'] = array('settings', t('Settings'), '', t('Account settings'));
 
-               if (feature_enabled(local_user(), 'multi_profiles')) {
+               if (Features::isEnabled(local_user(), 'multi_profiles')) {
                        $nav['profiles'] = array('profiles', t('Profiles'), '', t('Manage/Edit Profiles'));
                }
 

diff --git a/include/tags.php b/include/tags.php
index ba8770e6f97a96692a3f41419ac258da790f9a04..145f10968359bb5725bc0a313b6fb7f1dd40ce9b 100644 (file)
--- a/include/tags.php
+++ b/include/tags.php
@@ -1,6 +1,9 @@
 <?php
-
+/**
+ * @file include/tags.php
+ */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Object\Contact;
@@ -302,7 +305,7 @@ function tagcloud_wall_widget($limit = 50) {
                return "";
        }
 
-       if(feature_enabled($a->profile['profile_uid'], 'tagadelic')) {
+       if(Features::isEnabled($a->profile['profile_uid'], 'tagadelic')) {
                $owner_id = Contact::getIdForURL($a->profile['url']);
 
                if(!$owner_id) {

diff --git a/include/text.php b/include/text.php
index 9a3d24bd1ec82fbe7febade1a9d6239b54727c51..b3f75370e418c5abc19013108670f5fbd6e4e147 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -1,6 +1,9 @@
 <?php
-
+/**
+ * @file include/text.php
+ */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Content\Smilies;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
@@ -1046,7 +1049,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
                        '$action_url' => $url,
                        '$search_label' => t('Search'),
                        '$save_label' => t('Save'),
-                       '$savedsearch' => feature_enabled(local_user(),'savedsearch'),
+                       '$savedsearch' => Features::isEnabled(local_user(),'savedsearch'),
                        '$search_hint' => t('@name, !forum, #tags, content'),
                );
 

diff --git a/mod/admin.php b/mod/admin.php
index 1b6975ab899f7544ca145cb9596d6087a28ba03f..16cc31c7bcefb2ebaf1c7c8e90d42d5fec766d55 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1,11 +1,11 @@
 <?php
-
 /**
  * @file mod/admin.php
  *
  * @brief Friendica admin
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
@@ -2291,7 +2291,7 @@ function admin_page_features_post(App $a)
        logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
 
        $arr = array();
-       $features = get_features(false);
+       $features = Features::get(false);
 
        foreach ($features as $fname => $fdata) {
                foreach (array_slice($fdata, 1) as $f) {
@@ -2336,7 +2336,7 @@ function admin_page_features(App $a)
 {
        if ((argc() > 1) && (argv(1) === 'features')) {
                $arr = array();
-               $features = get_features(false);
+               $features = Features::get(false);
 
                foreach ($features as $fname => $fdata) {
                        $arr[$fname] = array();

diff --git a/mod/cal.php b/mod/cal.php
index 170e7ea4c2f44dc55a8383f037b41280bdd1a4be..4ee2efd5845e1f8163ef852396080a5233ff5e3d 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -5,8 +5,8 @@
  *     This calendar is for profile visitors and contains only the events
  *     of the profile owner
  */
-
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
@@ -301,7 +301,7 @@ function cal_content(App $a) {
 
                // Test permissions
                // Respect the export feature setting for all other /cal pages if it's not the own profile
-               if( ((local_user() !== intval($owner_uid))) && ! feature_enabled($owner_uid, "export_calendar")) {
+               if( ((local_user() !== intval($owner_uid))) && ! Features::isEnabled($owner_uid, "export_calendar")) {
                        notice( t('Permission denied.') . EOL);
                        goaway('cal/' . $nick);
                }

diff --git a/mod/editpost.php b/mod/editpost.php
index 57c9339047707e2c95ce4889d30c8f201f82e170..9285a46043f9e041e784e4230854b1554349928f 100644 (file)
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,9 @@
 <?php
-
+/**
+ * @file mod/editpost.php
+ */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
@@ -131,7 +134,7 @@ function editpost_content(App $a) {
                '$title' => htmlspecialchars($itm[0]['title']),
                '$placeholdertitle' => t('Set title'),
                '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
-               '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
+               '$placeholdercategory' => (Features::isEnabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
                '$emtitle' => t('Example: bob@example.com, mary@example.com'),
                '$lockstate' => $lockstate,
                '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user)),

diff --git a/mod/network.php b/mod/network.php
index e74df1633aab0daebfeb440826aa1ac1788f9a2f..c0a3c29b1d3305a3686c728d2743a92f56e372a1 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -3,6 +3,7 @@
  * @file mod/network.php
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Content\ForumManager;
 use Friendica\Core\System;
 use Friendica\Core\Config;
@@ -156,8 +157,8 @@ function network_init(App $a) {
                $a->page['aside'] = '';
        }
 
-       $a->page['aside'] .= (feature_enabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
-       $a->page['aside'] .= (feature_enabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : '');
+       $a->page['aside'] .= (Features::isEnabled(local_user(),'groups') ? group_side('network/0','network','standard',$group_id) : '');
+       $a->page['aside'] .= (Features::isEnabled(local_user(), 'forumlist_widget') ? ForumManager::widget(local_user(), $cid) : '');
        $a->page['aside'] .= posted_date_widget('network',local_user(),false);
        $a->page['aside'] .= networks_widget('network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
        $a->page['aside'] .= saved_searches($search);
@@ -166,7 +167,7 @@ function network_init(App $a) {
 
 function saved_searches($search) {
 
-       if (!feature_enabled(local_user(),'savedsearch')) {
+       if (!Features::isEnabled(local_user(),'savedsearch')) {
                return '';
        }
 
@@ -918,7 +919,7 @@ function network_tabs(App $a)
                ),
        );
 
-       if (feature_enabled(local_user(),'personal_tab')) {
+       if (Features::isEnabled(local_user(),'personal_tab')) {
                $tabs[] = array(
                        'label' => t('Personal'),
                        'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
@@ -929,7 +930,7 @@ function network_tabs(App $a)
                );
        }
 
-       if (feature_enabled(local_user(),'new_tab')) {
+       if (Features::isEnabled(local_user(),'new_tab')) {
                $tabs[] = array(
                        'label' => t('New'),
                        'url'   => 'network/new' . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : ''),
@@ -940,7 +941,7 @@ function network_tabs(App $a)
                );
        }
 
-       if (feature_enabled(local_user(),'link_tab')) {
+       if (Features::isEnabled(local_user(),'link_tab')) {
                $tabs[] = array(
                        'label' => t('Shared Links'),
                        'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
@@ -951,7 +952,7 @@ function network_tabs(App $a)
                );
        }
 
-       if (feature_enabled(local_user(),'star_posts')) {
+       if (Features::isEnabled(local_user(),'star_posts')) {
                $tabs[] = array(
                        'label' => t('Starred'),
                        'url'   => str_replace('/new', '', $cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',

diff --git a/mod/photos.php b/mod/photos.php
index 504f0ff1460df4fa5cc6b695c0c9568834fb15be..a9ba835cfe5509adfeb3fe7f36d7cdae81d6c440 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -3,6 +3,7 @@
  * @file mod/photos.php
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
@@ -895,7 +896,7 @@ function photos_post(App $a) {
 
        /// @TODO merge these 2 if() into one?
        if ($exif && $exif['GPS']) {
-               if (feature_enabled($channel_id,'photo_location')) {
+               if (Features::isEnabled($channel_id,'photo_location')) {
                        $lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
                        $lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
                }
@@ -1584,7 +1585,7 @@ function photos_content(App $a) {
                                $likebuttons = replace_macros($like_tpl, array(
                                        '$id' => $link_item['id'],
                                        '$likethis' => t("I like this \x28toggle\x29"),
-                                       '$nolike' => (feature_enabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
+                                       '$nolike' => (Features::isEnabled(local_user(), 'dislike') ? t("I don't like this \x28toggle\x29") : ''),
                                        '$wait' => t('Please wait'),
                                        '$return_path' => $a->query_string,
                                ));
@@ -1735,7 +1736,7 @@ function photos_content(App $a) {
 
 
                $response_verbs = array('like');
-               if (feature_enabled($owner_uid, 'dislike')) {
+               if (Features::isEnabled($owner_uid, 'dislike')) {
                        $response_verbs[] = 'dislike';
                }
                $responses = get_responses($conv_responses,$response_verbs, '', $link_item);

diff --git a/mod/ping.php b/mod/ping.php
index 99d5777ea02081388ddea6a3c69114ecd4d3281d..4bb1ffe00cdc28e3eb840ae199b6f58451cf91b2 100644 (file)
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -3,6 +3,7 @@
  * @file include/ping.php
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Cache;
 use Friendica\Core\System;
@@ -149,7 +150,7 @@ function ping_init(App $a)
                }
 
                if ($network_count) {
-                       if (intval(feature_enabled(local_user(), 'groups'))) {
+                       if (intval(Features::isEnabled(local_user(), 'groups'))) {
                                // Find out how unseen network posts are spread across groups
                                $group_counts = groups_count_unseen();
                                if (DBM::is_result($group_counts)) {
@@ -161,7 +162,7 @@ function ping_init(App $a)
                                }
                        }
 
-                       if (intval(feature_enabled(local_user(), 'forumlist_widget'))) {
+                       if (intval(Features::isEnabled(local_user(), 'forumlist_widget'))) {
                                $forum_counts = ForumManager::countUnseenItems();
                                if (DBM::is_result($forums_counts)) {
                                        foreach ($forums_counts as $forum_count) {

diff --git a/mod/profiles.php b/mod/profiles.php
index 75023beb64180038cc09c15b20cebaa166efba26..eb17f34dbf6c532fef54c88ed9dc008a7524aad3 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -3,6 +3,7 @@
  * @file mod/profiles.php
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
@@ -673,10 +674,10 @@ function profiles_content(App $a) {
                                array(t('No'), t('Yes')) //Off - On strings
                        ),
 
-                       '$multi_profiles'               => feature_enabled(local_user(), 'multi_profiles'),
+                       '$multi_profiles'               => Features::isEnabled(local_user(), 'multi_profiles'),
                        '$form_security_token'          => get_form_security_token("profile_edit"),
                        '$form_security_token_photo'    => get_form_security_token("profile_photo"),
-                       '$profile_clone_link'           => ((feature_enabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
+                       '$profile_clone_link'           => ((Features::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
                        '$profile_drop_link'            => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
 
                        '$profile_action' => t('Profile Actions'),
@@ -754,7 +755,7 @@ function profiles_content(App $a) {
                return $o;
        } else {
                // If we don't support multi profiles, don't display this list.
-               if (!feature_enabled(local_user(), 'multi_profiles')) {
+               if (!Features::isEnabled(local_user(), 'multi_profiles')) {
                        $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
                                local_user()
                        );

diff --git a/mod/search.php b/mod/search.php
index 984167fd78dc8367342519076c89c3f1f987dfc2..3d9236055392105cffa59af17c32f225e4dc1d29 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,20 +1,23 @@
 <?php
-
+/**
+ * @file mod/search.php
+ */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
 
-require_once("include/bbcode.php");
-require_once('include/security.php');
-require_once('include/conversation.php');
-require_once('mod/dirfind.php');
+require_once "include/bbcode.php";
+require_once 'include/security.php';
+require_once 'include/conversation.php';
+require_once 'mod/dirfind.php';
 
 function search_saved_searches() {
 
        $o = '';
 
-       if (! feature_enabled(local_user(),'savedsearch'))
+       if (! Features::isEnabled(local_user(),'savedsearch'))
                return $o;
 
        $r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",

diff --git a/mod/settings.php b/mod/settings.php
index 9af354a9bcd3df61a98bdf480826b9b21200249d..f81c76bdc417d2bb600f72abf03fdf55ec6e1472 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -3,6 +3,7 @@
  * @file mod/settings.php
  */
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Core\Config;
@@ -52,7 +53,7 @@ function settings_init(App $a) {
                ),
        );
 
-       if (get_features()) {
+       if (Features::get()) {
                $tabs[] =       array(
                                        'label' => t('Additional features'),
                                        'url'   => 'settings/features',
@@ -784,12 +785,12 @@ function settings_content(App $a) {
        if (($a->argc > 1) && ($a->argv[1] === 'features')) {
 
                $arr = array();
-               $features = get_features();
+               $features = Features::get();
                foreach ($features as $fname => $fdata) {
                        $arr[$fname] = array();
                        $arr[$fname][0] = $fdata[0];
                        foreach (array_slice($fdata,1) as $f) {
-                               $arr[$fname][1][] = array('feature_' .$f[0], $f[1],((intval(feature_enabled(local_user(), $f[0]))) ? "1" : ''), $f[2],array(t('Off'), t('On')));
+                               $arr[$fname][1][] = array('feature_' .$f[0], $f[1],((intval(Features::isEnabled(local_user(), $f[0]))) ? "1" : ''), $f[2],array(t('Off'), t('On')));
                        }
                }
 

diff --git a/src/Content/Features.php b/src/Content/Features.php
new file mode 100644 (file)
index 0000000..91216c9
--- /dev/null
+++ b/src/Content/Features.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @file src/Content/Features.php
+ * @brief Features management
+ */
+namespace Friendica\Content;
+
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+
+class Features
+{
+       /**
+        * @brief check if feature is enabled
+        *
+        * @return boolean
+        */
+       public static function isEnabled($uid, $feature)
+       {
+               $x = Config::get('feature_lock', $feature, false);
+
+               if ($x === false) {
+                       $x = PConfig::get($uid, 'feature', $feature, false);
+               }
+               if ($x === false) {
+                       $x = Config::get('feature', $feature, false);
+               }
+               if ($x === false) {
+                       $x = self::getDefault($feature);
+               }
+
+               $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
+               call_hooks('isEnabled',$arr);
+               return($arr['enabled']);
+       }
+
+       /**
+        * @brief check if feature is enabled or disabled by default
+        *
+        * @param string $feature
+        * @return boolean
+        */
+       private static function getDefault($feature) {
+               $f = self::get();
+               foreach ($f as $cat) {
+                       foreach ($cat as $feat) {
+                               if (is_array($feat) && $feat[0] === $feature)
+                                       return $feat[3];
+                       }
+               }
+               return false;
+       }
+
+       /**
+        * @brief Get a list of all available features
+        *
+        * The array includes the setting group, the setting name,
+        * explainations for the setting and if it's enabled or disabled
+        * by default
+        *
+        * @param bool $filtered True removes any locked features
+        *
+        * @return array
+        */
+       public static function get($filtered = true) {
+
+               $arr = array(
+
+                       // General
+                       'general' => array(
+                               t('General Features'),
+                               //array('expire',         t('Content Expiration'),              t('Remove old posts/comments after a period of time')),
+                               array('multi_profiles', t('Multiple Profiles'),                 t('Ability to create multiple profiles'), false, Config::get('feature_lock','multi_profiles', false)),
+                               array('photo_location', t('Photo Location'),                    t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'), false, Config::get('feature_lock','photo_location', false)),
+                               array('export_calendar', t('Export Public Calendar'),           t('Ability for visitors to download the public calendar'), false, Config::get('feature_lock','export_calendar', false)),
+                       ),
+
+                       // Post composition
+                       'composition' => array(
+                               t('Post Composition Features'),
+                               array('preview',        t('Post Preview'),                      t('Allow previewing posts and comments before publishing them'), false, Config::get('feature_lock','preview', false)),
+                               array('aclautomention', t('Auto-mention Forums'),               t('Add/remove mention when a forum page is selected/deselected in ACL window.'), false, Config::get('feature_lock','aclautomention', false)),
+                       ),
+
+                       // Network sidebar widgets
+                       'widgets' => array(
+                               t('Network Sidebar Widgets'),
+                               array('archives',       t('Search by Date'),                    t('Ability to select posts by date ranges'), false, Config::get('feature_lock','archives', false)),
+                               array('forumlist_widget', t('List Forums'),                     t('Enable widget to display the forums your are connected with'), true, Config::get('feature_lock','forumlist_widget', false)),
+                               array('groups',         t('Group Filter'),                      t('Enable widget to display Network posts only from selected group'), false, Config::get('feature_lock','groups', false)),
+                               array('networks',       t('Network Filter'),                    t('Enable widget to display Network posts only from selected network'), false, Config::get('feature_lock','networks', false)),
+                               array('savedsearch',    t('Saved Searches'),                    t('Save search terms for re-use'), false, Config::get('feature_lock','savedsearch', false)),
+                       ),
+
+                       // Network tabs
+                       'net_tabs' => array(
+                               t('Network Tabs'),
+                               array('personal_tab',   t('Network Personal Tab'),              t('Enable tab to display only Network posts that you\'ve interacted on'), false, Config::get('feature_lock','personal_tab', false)),
+                               array('new_tab',        t('Network New Tab'),                   t('Enable tab to display only new Network posts (from the last 12 hours)'), false, Config::get('feature_lock','new_tab', false)),
+                               array('link_tab',       t('Network Shared Links Tab'),          t('Enable tab to display only Network posts with links in them'), false, Config::get('feature_lock','link_tab', false)),
+                       ),
+
+                       // Item tools
+                       'tools' => array(
+                               t('Post/Comment Tools'),
+                               array('multi_delete',   t('Multiple Deletion'),                 t('Select and delete multiple posts/comments at once'), false, Config::get('feature_lock','multi_delete', false)),
+                               array('edit_posts',     t('Edit Sent Posts'),                   t('Edit and correct posts and comments after sending'), false, Config::get('feature_lock','edit_posts', false)),
+                               array('commtag',        t('Tagging'),                           t('Ability to tag existing posts'), false, Config::get('feature_lock','commtag', false)),
+                               array('categories',     t('Post Categories'),                   t('Add categories to your posts'), false, Config::get('feature_lock','categories', false)),
+                               array('filing',         t('Saved Folders'),                     t('Ability to file posts under folders'), false, Config::get('feature_lock','filing', false)),
+                               array('dislike',        t('Dislike Posts'),                     t('Ability to dislike posts/comments'), false, Config::get('feature_lock','dislike', false)),
+                               array('star_posts',     t('Star Posts'),                        t('Ability to mark special posts with a star indicator'), false, Config::get('feature_lock','star_posts', false)),
+                               array('ignore_posts',   t('Mute Post Notifications'),           t('Ability to mute notifications for a thread'), false, Config::get('feature_lock','ignore_posts', false)),
+                       ),
+
+                       // Advanced Profile Settings
+                       'advanced_profile' => array(
+                               t('Advanced Profile Settings'),
+                               array('forumlist_profile', t('List Forums'),                    t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile', false)),
+                               array('tagadelic',      t('Tag Cloud'),                         t('Provide a personal tag cloud on your profile page'), false, Config::get('feature_lock', 'tagadelic', false)),
+                       ),
+               );
+
+               // removed any locked features and remove the entire category if this makes it empty
+
+               if ($filtered) {
+                       foreach ($arr as $k => $x) {
+                               $has_items = false;
+                               $kquantity = count($arr[$k]);
+                               for ($y = 0; $y < $kquantity; $y ++) {
+                                       if (is_array($arr[$k][$y])) {
+                                               if ($arr[$k][$y][4] === false) {
+                                                       $has_items = true;
+                                               } else {
+                                                       unset($arr[$k][$y]);
+                                               }
+                                       }
+                               }
+                               if (! $has_items) {
+                                       unset($arr[$k]);
+                               }
+                       }
+               }
+
+               call_hooks('get',$arr);
+               return $arr;
+       }
+}

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index e5d153f75960c5988ae34816ddd0c49689450fc8..8df416e331d75ab5dae471c6c8a72d500db2922a 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -6,6 +6,7 @@
 namespace Friendica\Content;
 
 use Friendica\App;
+use Friendica\Content\Features;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use dba;
@@ -82,7 +83,7 @@ class ForumManager
         */
        public static function widget($uid, $cid = 0)
        {
-               if (! intval(feature_enabled(local_user(), 'forumlist_widget'))) {
+               if (! intval(Features::isEnabled(local_user(), 'forumlist_widget'))) {
                        return;
                }
 
@@ -141,7 +142,7 @@ class ForumManager
         */
        public static function profileAdvanced($uid)
        {
-               $profile = intval(feature_enabled($uid, 'forumlist_profile'));
+               $profile = intval(Features::isEnabled($uid, 'forumlist_profile'));
                if (! $profile) {
                        return;
                }

diff --git a/src/Object/Item.php b/src/Object/Item.php
index cd05b91cf93dde3071573a82f7e255c02cb411a7..d9a376a50464ab839264ad52c178d9eb14c80b02 100644 (file)
--- a/src/Object/Item.php
+++ b/src/Object/Item.php
@@ -5,6 +5,7 @@
 namespace Friendica\Object;
 
 use Friendica\BaseObject;
+use Friendica\Content\Features;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBM;
@@ -161,7 +162,7 @@ class Item extends BaseObject
 
                $drop = array(
                        'dropping' => $dropping,
-                       'pagedrop' => ((feature_enabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
+                       'pagedrop' => ((Features::isEnabled($conv->getProfileOwner(), 'multi_delete')) ? $item['pagedrop'] : ''),
                        'select'   => t('Select'),
                        'delete'   => t('Delete'),
                );
@@ -279,7 +280,7 @@ class Item extends BaseObject
                                }
 
                                $tagger = '';
-                               if (feature_enabled($conv->getProfileOwner(), 'commtag')) {
+                               if (Features::isEnabled($conv->getProfileOwner(), 'commtag')) {
                                        $tagger = array(
                                                'add'   => t("add tag"),
                                                'class' => "",
@@ -293,7 +294,7 @@ class Item extends BaseObject
                if ($conv->isWritable()) {
                        $buttons = array(
                                'like' => array( t("I like this \x28toggle\x29"), t("like")),
-                               'dislike' => ((feature_enabled($conv->getProfileOwner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''),
+                               'dislike' => ((Features::isEnabled($conv->getProfileOwner(), 'dislike')) ? array( t("I don't like this \x28toggle\x29"), t("dislike")) : ''),
                        );
                        if ($shareable) {
                                $buttons['share'] = array( t('Share this'), t('share'));
@@ -378,12 +379,12 @@ class Item extends BaseObject
                        'owner_photo'     => $a->remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
                        'owner_name'      => htmlentities($owner_name_e),
                        'plink'           => get_plink($item),
-                       'edpost'          => ((feature_enabled($conv->getProfileOwner(), 'edit_posts')) ? $edpost : ''),
+                       'edpost'          => ((Features::isEnabled($conv->getProfileOwner(), 'edit_posts')) ? $edpost : ''),
                        'isstarred'       => $isstarred,
-                       'star'            => ((feature_enabled($conv->getProfileOwner(), 'star_posts')) ? $star : ''),
-                       'ignore'          => ((feature_enabled($conv->getProfileOwner(), 'ignore_posts')) ? $ignore : ''),
+                       'star'            => ((Features::isEnabled($conv->getProfileOwner(), 'star_posts')) ? $star : ''),
+                       'ignore'          => ((Features::isEnabled($conv->getProfileOwner(), 'ignore_posts')) ? $ignore : ''),
                        'tagger'          => $tagger,
-                       'filer'           => ((feature_enabled($conv->getProfileOwner(), 'filing')) ? $filer : ''),
+                       'filer'           => ((Features::isEnabled($conv->getProfileOwner(), 'filing')) ? $filer : ''),
                        'drop'            => $drop,
                        'vote'            => $buttons,
                        'like'            => $responses['like']['output'],
@@ -791,7 +792,7 @@ class Item extends BaseObject
                                '$edimg'       => t('Image'),
                                '$edurl'       => t('Link'),
                                '$edvideo'     => t('Video'),
-                               '$preview'     => ((feature_enabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
+                               '$preview'     => ((Features::isEnabled($conv->getProfileOwner(), 'preview')) ? t('Preview') : ''),
                                '$indent'      => $indent,
                                '$sourceapp'   => t($a->sourcename),
                                '$ww'          => (($conv->getMode() === 'network') ? $ww : ''),