Merge pull request #3463 from friendica/develop

[friendica.git] / include / features.php

diff --git a/include/features.php b/include/features.php
index b3e3454b17d667b6a61a67730dffb3c367b563fd..07dcced0e6da630b1142f9112f080a68b8843d19 100644 (file)
--- a/include/features.php
+++ b/include/features.php
@@ -7,20 +7,22 @@
 
 /**
  * @brief check if feature is enabled
- * 
+ *
  * @return boolean
  */
-function feature_enabled($uid,$feature) {
-
-       $x = get_config('feature_lock',$feature);
-       if($x === false) {
-               $x = get_pconfig($uid,'feature',$feature);
-               if($x === false) {
-                       $x = get_config('feature',$feature);
-                       if($x === false)
+function feature_enabled($uid, $feature) {
+       $x = get_config('feature_lock', $feature);
+
+       if ($x === false) {
+               $x = get_pconfig($uid, 'feature', $feature);
+               if ($x === false) {
+                       $x = get_config('feature', $feature);
+                       if ($x === false) {
                                $x = get_feature_default($feature);
+                       }
                }
        }
+
        $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
        call_hooks('feature_enabled',$arr);
        return($arr['enabled']);
@@ -28,15 +30,15 @@ function feature_enabled($uid,$feature) {
 
 /**
  * @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)
+       foreach ($f as $cat) {
+               foreach ($cat as $feat) {
+                       if (is_array($feat) && $feat[0] === $feature)
                                return $feat[3];
                }
        }
@@ -45,13 +47,13 @@ function get_feature_default($feature) {
 
 /**
  * @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) {
@@ -70,9 +72,8 @@ function get_features($filtered = true) {
                // Post composition
                'composition' => array(
                        t('Post Composition Features'),
-                       array('richtext',       t('Richtext Editor'),                   t('Enable richtext editor'), false, get_config('feature_lock','richtext')),
                        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 fourm page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
+                       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')),
                ),
 
                // Network sidebar widgets
@@ -115,13 +116,13 @@ function get_features($filtered = true) {
 
        // 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 ($arr[$k][$y][4] === false) {
                                                $has_items = true;
                                        }
                                        else {
@@ -129,7 +130,7 @@ function get_features($filtered = true) {
                                        }
                                }
                        }
-                       if(! $has_items) {
+                       if (! $has_items) {
                                unset($arr[$k]);
                        }
                }