X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FFeature.php;h=db0a70e2fb6377edd1dfb7f40a585201015a8d32;hb=0ca762001b25d3a81eede8ea7cc814eb727609cf;hp=92cb9ae7734b1b54592cc99450517f8c72e00489;hpb=8b557c315775eb8bac7489a2a7728eb3b0a0b953;p=friendica.git

diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index 92cb9ae773..db0a70e2fb 100644
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -5,8 +5,8 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
@@ -18,6 +18,7 @@ class Feature
 	 * @param integer $uid     user id
 	 * @param string  $feature feature
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function isEnabled($uid, $feature)
 	{
@@ -36,7 +37,7 @@ class Feature
 		}
 
 		$arr = ['uid' => $uid, 'feature' => $feature, 'enabled' => $x];
-		Addon::callHooks('isEnabled', $arr);
+		Hook::callAll('isEnabled', $arr);
 		return($arr['enabled']);
 	}
 
@@ -45,6 +46,7 @@ class Feature
 	 *
 	 * @param string $feature feature
 	 * @return boolean
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private static function getDefault($feature)
 	{
@@ -69,6 +71,7 @@ class Feature
 	 * @param bool $filtered True removes any locked features
 	 *
 	 * @return array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public static function get($filtered = true)
 	{
@@ -86,24 +89,19 @@ class Feature
 			// Post composition
 			'composition' => [
 				L10n::t('Post Composition Features'),
-				['preview',        L10n::t('Post Preview'),        L10n::t('Allow previewing posts and comments before publishing them'), false, Config::get('feature_lock', 'preview', false)],
 				['aclautomention', L10n::t('Auto-mention Forums'), L10n::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' => [
-				L10n::t('Network Sidebar Widgets'),
-				['archives',         L10n::t('Search by Date'), L10n::t('Ability to select posts by date ranges'), false, Config::get('feature_lock', 'archives', false)],
-				['forumlist_widget', L10n::t('List Forums'),    L10n::t('Enable widget to display the forums your are connected with'), true, Config::get('feature_lock', 'forumlist_widget', false)],
-				['groups',           L10n::t('Group Filter'),   L10n::t('Enable widget to display Network posts only from selected group'), false, Config::get('feature_lock', 'groups', false)],
-				['networks',         L10n::t('Network Filter'), L10n::t('Enable widget to display Network posts only from selected network'), false, Config::get('feature_lock', 'networks', false)],
-				['savedsearch',      L10n::t('Saved Searches'), L10n::t('Save search terms for re-use'), false, Config::get('feature_lock', 'savedsearch', false)],
+				L10n::t('Network Sidebar'),
+				['archives',         L10n::t('Archives'), L10n::t('Ability to select posts by date ranges'), false, Config::get('feature_lock', 'archives', false)],
+				['networks',         L10n::t('Protocol Filter'), L10n::t('Enable widget to display Network posts only from selected protocols'), false, Config::get('feature_lock', 'networks', false)],
 			],
 
 			// Network tabs
 			'net_tabs' => [
 				L10n::t('Network Tabs'),
-				['personal_tab', L10n::t('Network Personal Tab'),     L10n::t('Enable tab to display only Network posts that you\'ve interacted on'), false, Config::get('feature_lock', 'personal_tab', false)],
 				['new_tab',      L10n::t('Network New Tab'),          L10n::t("Enable tab to display only new Network posts \x28from the last 12 hours\x29"), false, Config::get('feature_lock', 'new_tab', false)],
 				['link_tab',     L10n::t('Network Shared Links Tab'), L10n::t('Enable tab to display only Network posts with links in them'), false, Config::get('feature_lock', 'link_tab', false)],
 			],
@@ -111,14 +109,7 @@ class Feature
 			// Item tools
 			'tools' => [
 				L10n::t('Post/Comment Tools'),
-				['multi_delete', L10n::t('Multiple Deletion'),       L10n::t('Select and delete multiple posts/comments at once'), false, Config::get('feature_lock', 'multi_delete', false)],
-				['edit_posts',   L10n::t('Edit Sent Posts'),         L10n::t('Edit and correct posts and comments after sending'), false, Config::get('feature_lock', 'edit_posts', false)],
-				['commtag',      L10n::t('Tagging'),                 L10n::t('Ability to tag existing posts'), false, Config::get('feature_lock', 'commtag', false)],
 				['categories',   L10n::t('Post Categories'),         L10n::t('Add categories to your posts'), false, Config::get('feature_lock', 'categories', false)],
-				['filing',       L10n::t('Saved Folders'),           L10n::t('Ability to file posts under folders'), false, Config::get('feature_lock', 'filing', false)],
-				['dislike',      L10n::t('Dislike Posts'),           L10n::t('Ability to dislike posts/comments'), false, Config::get('feature_lock', 'dislike', false)],
-				['star_posts',   L10n::t('Star Posts'),              L10n::t('Ability to mark special posts with a star indicator'), false, Config::get('feature_lock', 'star_posts', false)],
-				['ignore_posts', L10n::t('Mute Post Notifications'), L10n::t('Ability to mute notifications for a thread'), false, Config::get('feature_lock', 'ignore_posts', false)],
 			],
 
 			// Advanced Profile Settings
@@ -151,7 +142,7 @@ class Feature
 			}
 		}
 
-		Addon::callHooks('get', $arr);
+		Hook::callAll('get', $arr);
 		return $arr;
 	}
 }