Fixes #6766 Let Super User view and edit segments created by other users

As a Super User: * I can now see all segments that were created for this website by any other user * When a segment was created by another user who is not Super User, the segment appears below a new section "Visible to you because you have Super User access:" * Such segments are editable by the Super User * The only difference when editing someone else's segment, as a Super User, is that "This segment is visible to [ME]" now says "This segment is visible to [SEGMENT_AUTHOR_USERNAME]" * One can now search in the search bar for a username and see all segments created by this user For all users: * New section "Shared with you:" now lists segments created by a Super User, and marked as "Visible to [All Users]" * Before segments shared with me, looked the same as segments I created, which was confusing
matomo-org · Jan 22, 2016 · a38c0c3 · a38c0c3
1 parent d7211cd
commit a38c0c3
Show file tree

Hide file tree

Showing 12 changed files with 465 additions and 86 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -87,6 +87,7 @@
         "Continue": "Continue",
         "ContinueToPiwik": "Continue to Piwik",
         "CurrentlyUsingUnsecureHttp": "You are currently using Piwik over unsecure HTTP, which can be risky. We recommend you set up Piwik to use SSL (HTTPS) for improved security.",
+        "CreatedByUser": "created by %s",
         "CurrentMonth": "Current Month",
         "CurrentWeek": "Current Week",
         "CurrentYear": "Current Year",

diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
@@ -278,5 +278,6 @@ public function getClientSideTranslationKeys(&$translationKeys)
         $translationKeys[] = 'CoreHome_MenuEntries';
         $translationKeys[] = 'SitesManager_Sites';
         $translationKeys[] = 'CoreHome_ChangeCurrentWebsite';
+        $translationKeys[] = 'General_CreatedByUser';
     }
 }
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
@@ -257,7 +257,7 @@
 
 ul.widgetpreview-widgetlist,
 ul.widgetpreview-categorylist {
-  color: #5d5342;
+  color: @theme-color-text-light;
   list-style: none;
   font-size: 11px;
   line-height: 20px;
@@ -318,7 +318,7 @@ div.widgetpreview-preview {
   font-weight: normal;
   padding-top: 10px;
   margin-left: 10px;
-  color: #5D5342;
+  color: @theme-color-text-light;
   list-style: none;
   font-size: 11px;
   line-height: 20px;

diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php
@@ -351,15 +351,52 @@ public function getAll($idSite = false)
         $userLogin = Piwik::getCurrentUserLogin();
 
         $model = $this->getModel();
-        if (empty($idSite)) {
-            $segments = $model->getAllSegments($userLogin);
+        if(Piwik::hasUserSuperUserAccess()) {
+            $segments = $model->getAllSegmentsForAllUsers($idSite);
         } else {
-            $segments = $model->getAllSegmentsForSite($idSite, $userLogin);
+            if (empty($idSite)) {
+                $segments = $model->getAllSegments($userLogin);
+            } else {
+                $segments = $model->getAllSegmentsForSite($idSite, $userLogin);
+            }
         }
 
+        $segments = $this->sortSegmentsCreatedByUserFirst($segments);
+
         return $segments;
     }
 
+    /**
+     * Sorts segment in a particular order:
+     *
+     *  1) my segments
+     *  2) segments created by the super user that were shared with all users
+     *  3) segments created by other users (which are visible to all super users)
+     *
+     * @param $segments
+     * @return array
+     */
+    private function sortSegmentsCreatedByUserFirst($segments)
+    {
+        $orderedSegments = array();
+        foreach($segments as $id => &$segment) {
+            if($segment['login'] == Piwik::getCurrentUserLogin()) {
+                $orderedSegments[] = $segment;
+                unset($segments[$id]);
+            }
+        }
+        foreach($segments as $id => &$segment) {
+            if($segment['enable_all_users'] == 1) {
+                $orderedSegments[] = $segment;
+                unset($segments[$id]);
+            }
+        }
+        foreach($segments as $id => &$segment) {
+            $orderedSegments[] = $segment;
+        }
+        return $orderedSegments;
+    }
+
     /**
      * @return string
      */

diff --git a/plugins/SegmentEditor/Model.php b/plugins/SegmentEditor/Model.php
@@ -98,6 +98,27 @@ public function getAllSegmentsForSite($idSite, $userLogin)
         return $segments;
     }
 
+    /**
+     * This should be used _only_ by Super Users
+     * @param $idSite
+     * @return array
+     */
+    public function getAllSegmentsForAllUsers($idSite = false)
+    {
+        $bind = array();
+        $sqlWhereCondition = '';
+
+        if(!empty($idSite)) {
+            $bind = array($idSite);
+            $sqlWhereCondition = '(enable_only_idsite = ? OR enable_only_idsite = 0) AND';
+        }
+
+        $sqlWhereCondition  = $this->buildQuerySortedByName($sqlWhereCondition . ' deleted = 0');
+        $segments = $this->getDb()->fetchAll($sqlWhereCondition, $bind);
+
+        return $segments;
+    }
+
     public function deleteSegment($idSegment)
     {
         $db = $this->getDb();

diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
@@ -88,5 +88,7 @@ public static function isAddingSegmentsForAllWebsitesEnabled()
     public function getClientSideTranslationKeys(&$translationKeys)
     {
         $translationKeys[] = 'SegmentEditor_CustomSegment';
+        $translationKeys[] = 'SegmentEditor_VisibleToSuperUser';
+        $translationKeys[] = 'SegmentEditor_SharedWithYou';
     }
 }