PIWIK-767 cleanup after review

config/global.ini.php

@@ -6,9 +6,6 @@
 ; edit config/config.ini.php and add the following:
 ; [General]
 ; action_title_category_delimiter = "-"
-; Change the following value to set the required access level for creating, editing and removing segments
-; Possible values are "view", "admin" and "superadmin"
-segment_editor_required_access = "admin"
 
 ;--------
 ; WARNING - YOU SHOULD NOT EDIT THIS FILE DIRECTLY - Edit config.ini.php instead.
@@ -425,6 +422,10 @@ enable_auto_update = 1
 ; If set to 0 it also disables the "sent plugin update emails" feature in general and the related setting in the UI.
 enable_update_communication = 1
 
+; Change the following value to set the required access level for creating, editing and removing segments
+; Possible values are "view", "admin" and "superadmin"
+segment_editor_required_access = "admin"
+
 [Tracker]
 ; Piwik uses first party cookies by default. If set to 1,
 ; the visit ID cookie will be set on the Piwik server domain as well

plugins/SegmentEditor/API.php

@@ -124,16 +124,9 @@ class API extends \Piwik\Plugin\API
     {
         $requiredAccess = isset(Config::getInstance()->General['segment_editor_required_access']) ? Config::getInstance()->General['segment_editor_required_access'] : "view";
 
-        if(
-            false == (
-                $this->checkSuperAdminAccess($requiredAccess) ||
+        return ($this->checkSuperAdminAccess($requiredAccess) ||
                 $this->checkViewAccess($requiredAccess, $siteid) ||
-                $this->checkAdminAccess($requiredAccess, $siteid)
-            )
-        ) {
-            return false;
-        }
-        return true;
+                $this->checkAdminAccess($requiredAccess, $siteid));
     }
 
     private function checkSuperAdminAccess($requiredAccess)