PIWIK-767 cleanup after review

3 files changed, 10 insertions, 25 deletions

diff --git a/config/global.ini.php b/config/global.ini.php
index 22674ae735..db59ddac7c 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -424,7 +424,7 @@ 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"
+segment_editor_required_access = "view"
 
 [Tracker]
 ; Piwik uses first party cookies by default. If set to 1,
diff --git a/lang/en.json b/lang/en.json
index 37df529d9b..fe359f5bb6 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1568,7 +1568,8 @@
         "VisibleToAllUsers": "all users",
         "VisibleToMe": "me",
         "YouMayChangeSetting": "Alternatively you may change the setting in the config file (%s), or edit this Segment and choose '%s'.",
-        "YouMustBeLoggedInToCreateSegments": "You must be logged in to create and edit custom visitor segments."
+        "YouMustBeLoggedInToCreateSegments": "You must be logged in to create and edit custom visitor segments.",
+        "YouDontHaveAccessToCreateSegments": "You don't have the required access level to create and edit segments."
     },
     "SEO": {
         "AlexaRank": "Alexa Rank",
diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php
index f2a4d075bc..3911e9f9db 100644
--- a/plugins/SegmentEditor/API.php
+++ b/plugins/SegmentEditor/API.php
@@ -112,17 +112,16 @@ class API extends \Piwik\Plugin\API
         }
     }
 
-
     protected function checkUserCanEditSegment($siteid = false)
     {
         if($this->isUserCanEditSegment($siteid) == false) {
-            throw new Exception("You don't have the required access level to do this.");
+            throw new Exception(Piwik::translate('SegmentEditor_YouDontHaveAccessToCreateSegments'));
         }
     }
 
     public function isUserCanEditSegment($siteid = false)
     {
-        $requiredAccess = isset(Config::getInstance()->General['segment_editor_required_access']) ? Config::getInstance()->General['segment_editor_required_access'] : "view";
+        $requiredAccess = Config::getInstance()->General['segment_editor_required_access'];
 
         return ($this->checkSuperAdminAccess($requiredAccess) ||
                 $this->checkViewAccess($requiredAccess, $siteid) ||
@@ -131,34 +130,19 @@ class API extends \Piwik\Plugin\API
 
     private function checkSuperAdminAccess($requiredAccess)
     {
-        if ($requiredAccess == 'superadmin' && Piwik::hasUserSuperUserAccess()) {
-            return true;
-        }
-        return false;
+        return ($requiredAccess == 'superadmin' && Piwik::hasUserSuperUserAccess());
     }
 
     private function checkViewAccess($requiredAccess, $siteid)
     {
-        if (
-            $requiredAccess == 'view' && (
-                Piwik::isUserHasViewAccess($siteid) || ($siteid === 0 && Piwik::isUserHasSomeViewAccess())
-            )
-        ) {
-            return true;
-        }
-        return false;
+        return ($requiredAccess == 'view' && (
+                Piwik::isUserHasViewAccess($siteid) || ($siteid === 0 && Piwik::isUserHasSomeViewAccess())));
     }
 
     private function checkAdminAccess($requiredAccess, $siteid)
     {
-        if (
-            $requiredAccess == 'admin' && (
-                Piwik::isUserHasAdminAccess($siteid) || ($siteid === 0 && Piwik::isUserHasSomeAdminAccess())
-            )
-        ) {
-            return true;
-        }
-        return false;
+        return ($requiredAccess == 'admin' && (
+                Piwik::isUserHasAdminAccess($siteid) || ($siteid === 0 && Piwik::isUserHasSomeAdminAccess())));
     }
 
     protected function checkUserCanModifySegment($segment)