X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffeatures.php;h=340394ecea36f275860877378e9c01ed74593886;hb=59ae5633ec9080845a02de99665293655bd8b726;hp=74c110427ce6c8d87d02c1039bc59407d1960aa9;hpb=45ebeba643a6d600e8778475f70f827f32bf3146;p=friendica.git

diff --git a/include/features.php b/include/features.php
index 74c110427c..340394ecea 100644
--- a/include/features.php
+++ b/include/features.php
@@ -5,19 +5,22 @@
  * @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 = get_config('feature_lock', $feature);
+	$x = Config::get('feature_lock', $feature);
 
-	if ($x === false) {
-		$x = get_pconfig($uid, 'feature', $feature);
-		if ($x === false) {
-			$x = get_config('feature', $feature);
-			if ($x === false) {
+	if (is_null($x)) {
+		$x = PConfig::get($uid, 'feature', $feature);
+		if (is_null($x)) {
+			$x = Config::get('feature', $feature);
+			if (is_null($x)) {
 				$x = get_feature_default($feature);
 			}
 		}
@@ -36,9 +39,9 @@ function feature_enabled($uid, $feature) {
  */
 function get_feature_default($feature) {
 	$f = get_features();
-	foreach($f as $cat) {
-		foreach($cat as $feat) {
-			if(is_array($feat) && $feat[0] === $feature)
+	foreach ($f as $cat) {
+		foreach ($cat as $feat) {
+			if (is_array($feat) && $feat[0] === $feature)
 				return $feat[3];
 		}
 	}
@@ -64,65 +67,66 @@ function get_features($filtered = true) {
 		'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, get_config('feature_lock','multi_profiles')),
-			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, get_config('feature_lock','photo_location')),
-			array('export_calendar', t('Export Public Calendar'),		t('Ability for visitors to download the public calendar'), false, get_config('feature_lock','export_calendar')),
+			array('multi_profiles', t('Multiple Profiles'),			t('Ability to create multiple profiles'), false, Config::get('feature_lock','multi_profiles')),
+			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')),
+			array('export_calendar', t('Export Public Calendar'),		t('Ability for visitors to download the public calendar'), false, Config::get('feature_lock','export_calendar')),
 		),
 
 		// Post composition
 		'composition' => array(
 			t('Post Composition Features'),
-			array('preview',	t('Post Preview'),			t('Allow previewing posts and comments before publishing them'), false, get_config('feature_lock','preview')),
-			array('aclautomention',	t('Auto-mention Forums'),		t('Add/remove mention when a forum page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
+			array('preview',	t('Post Preview'),			t('Allow previewing posts and comments before publishing them'), false, Config::get('feature_lock','preview')),
+			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')),
 		),
 
 		// Network sidebar widgets
 		'widgets' => array(
 			t('Network Sidebar Widgets'),
-			array('archives',	t('Search by Date'),			t('Ability to select posts by date ranges'), false, get_config('feature_lock','archives')),
-			array('forumlist_widget', t('List Forums'),			t('Enable widget to display the forums your are connected with'), true, get_config('feature_lock','forumlist_widget')),
-			array('groups',		t('Group Filter'),			t('Enable widget to display Network posts only from selected group'), false, get_config('feature_lock','groups')),
-			array('networks',	t('Network Filter'),			t('Enable widget to display Network posts only from selected network'), false, get_config('feature_lock','networks')),
-			array('savedsearch',	t('Saved Searches'),			t('Save search terms for re-use'), false, get_config('feature_lock','savedsearch')),
+			array('archives',	t('Search by Date'),			t('Ability to select posts by date ranges'), false, Config::get('feature_lock','archives')),
+			array('forumlist_widget', t('List Forums'),			t('Enable widget to display the forums your are connected with'), true, Config::get('feature_lock','forumlist_widget')),
+			array('groups',		t('Group Filter'),			t('Enable widget to display Network posts only from selected group'), false, Config::get('feature_lock','groups')),
+			array('networks',	t('Network Filter'),			t('Enable widget to display Network posts only from selected network'), false, Config::get('feature_lock','networks')),
+			array('savedsearch',	t('Saved Searches'),			t('Save search terms for re-use'), false, Config::get('feature_lock','savedsearch')),
 		),
 
 		// 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, get_config('feature_lock','personal_tab')),
-			array('new_tab',	t('Network New Tab'),			t('Enable tab to display only new Network posts (from the last 12 hours)'), false, get_config('feature_lock','new_tab')),
-			array('link_tab',	t('Network Shared Links Tab'),		t('Enable tab to display only Network posts with links in them'), false, get_config('feature_lock','link_tab')),
+			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')),
+			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')),
+			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')),
 		),
 
 		// Item tools
 		'tools' => array(
 			t('Post/Comment Tools'),
-			array('multi_delete',	t('Multiple Deletion'),			t('Select and delete multiple posts/comments at once'), false, get_config('feature_lock','multi_delete')),
-			array('edit_posts',	t('Edit Sent Posts'),			t('Edit and correct posts and comments after sending'), false, get_config('feature_lock','edit_posts')),
-			array('commtag',	t('Tagging'),				t('Ability to tag existing posts'), false, get_config('feature_lock','commtag')),
-			array('categories',	t('Post Categories'),			t('Add categories to your posts'), false, get_config('feature_lock','categories')),
-			array('filing',		t('Saved Folders'),			t('Ability to file posts under folders'), false, get_config('feature_lock','filing')),
-			array('dislike',	t('Dislike Posts'),			t('Ability to dislike posts/comments'), false, get_config('feature_lock','dislike')),
-			array('star_posts',	t('Star Posts'),			t('Ability to mark special posts with a star indicator'), false, get_config('feature_lock','star_posts')),
-			array('ignore_posts',	t('Mute Post Notifications'),		t('Ability to mute notifications for a thread'), false, get_config('feature_lock','ignore_posts')),
+			array('multi_delete',	t('Multiple Deletion'),			t('Select and delete multiple posts/comments at once'), false, Config::get('feature_lock','multi_delete')),
+			array('edit_posts',	t('Edit Sent Posts'),			t('Edit and correct posts and comments after sending'), false, Config::get('feature_lock','edit_posts')),
+			array('commtag',	t('Tagging'),				t('Ability to tag existing posts'), false, Config::get('feature_lock','commtag')),
+			array('categories',	t('Post Categories'),			t('Add categories to your posts'), false, Config::get('feature_lock','categories')),
+			array('filing',		t('Saved Folders'),			t('Ability to file posts under folders'), false, Config::get('feature_lock','filing')),
+			array('dislike',	t('Dislike Posts'),			t('Ability to dislike posts/comments'), false, Config::get('feature_lock','dislike')),
+			array('star_posts',	t('Star Posts'),			t('Ability to mark special posts with a star indicator'), false, Config::get('feature_lock','star_posts')),
+			array('ignore_posts',	t('Mute Post Notifications'),		t('Ability to mute notifications for a thread'), false, Config::get('feature_lock','ignore_posts')),
 		),
 
 		// 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, get_config('feature_lock','forumlist_profile')),
+			array('forumlist_profile', t('List Forums'),			t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile')),
+			array('tagadelic',	t('Tag Cloud'),				t('Provide a personal tag cloud on your profile page'), false, Config::get('feature_lock', 'tagadelic')),
 		),
 	);
 
 	// removed any locked features and remove the entire category if this makes it empty
 
-	if($filtered) {
-		foreach($arr as $k => $x) {
+	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) {
+			for ($y = 0; $y < $kquantity; $y ++) {
+				if (is_array($arr[$k][$y])) {
+					if (is_null($arr[$k][$y][4])) {
 						$has_items = true;
 					}
 					else {
@@ -130,7 +134,7 @@ function get_features($filtered = true) {
 					}
 				}
 			}
-			if(! $has_items) {
+			if (! $has_items) {
 				unset($arr[$k]);
 			}
 		}