From 69bc09673c96ac6317df541df12e86584aaa1761 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Thu, 10 Dec 2015 00:47:03 +0000
Subject: fixes #4314 Don't let "admin" users see all other users in Piwik

---
 plugins/UsersManager/templates/index.twig | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'plugins/UsersManager/templates/index.twig')

diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 6bf12d01e0..9ce934ec18 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -55,6 +55,7 @@
         {% set accesInvalid %}<img src='plugins/UsersManager/images/no-access.png' class='updateAccess' />{% endset %}
         {% set superUserAccess %}<span title="{{ 'UsersManager_ExceptionSuperUserAccess'|translate }}">N/A</span>{% endset %}
         {% for login,access in usersAccessByWebsite %}
+            {% if userIsSuperUser or (hasOnlyAdminAccess and access!='noaccess')  %}
             <tr>
                 <td id='login'>{{ login }}</td>
                 <td>{{ usersAliasByLogin[login]|raw }}</td>
@@ -84,12 +85,34 @@
                     {% endif %}
                 </td>
             </tr>
+            {% endif %}
         {% endfor %}
         </tbody>
     </table>
     <div id="accessUpdated" style="vertical-align:top;"></div>
 </div>
 
+{% if hasOnlyAdminAccess %}
+    <p>
+        <button id="showGiveViewAccessForm" class="add-user btn btn-lg btn-flat">
+            <span class="icon-add"></span>
+            {{ 'UsersManager_GiveViewAccessTitle'|translate('"' ~ defaultReportSiteName ~ '"') }}
+        </button>
+    </p>
+    <form id="giveViewAccessForm">
+        <div class="form-group">
+            <input type="text" name="user_invite"
+                   id="user_invite"
+                   placeholder="{{ 'UsersManager_EnterUsernameOrEmail'|translate|e('html_attr') }}"
+                   title="{{ 'UsersManager_GiveViewAccessInstructions'|translate("'" ~ defaultReportSiteName ~ "'")|e('html_attr') }}">
+        </div>
+
+         <input class="btn" type="button" id="giveUserAccessToViewReports" value="{{ 'UsersManager_GiveViewAccess'|translate|e('html_attr') }}">
+    </form>
+    {{ ajax.errorDiv('ajaxErrorGiveViewAccess') }}
+    {{ ajax.loadingDiv('ajaxLoadingGiveViewAccess') }}
+{% endif %}
+
 <div class="ui-confirm" id="confirm">
     <h2>{{ 'UsersManager_ChangeAllConfirm'|translate("<span id='login'></span>")|raw }}</h2>
     <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
-- 
cgit v1.2.3


From cc775ad720e75e8042e29e5fef12f2ebfa21a7be Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Fri, 11 Dec 2015 03:21:59 +0000
Subject: added tests for all websites

---
 plugins/UsersManager/templates/index.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/UsersManager/templates/index.twig')

diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index 9ce934ec18..be07ac9381 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -55,7 +55,7 @@
         {% set accesInvalid %}<img src='plugins/UsersManager/images/no-access.png' class='updateAccess' />{% endset %}
         {% set superUserAccess %}<span title="{{ 'UsersManager_ExceptionSuperUserAccess'|translate }}">N/A</span>{% endset %}
         {% for login,access in usersAccessByWebsite %}
-            {% if userIsSuperUser or (hasOnlyAdminAccess and access!='noaccess')  %}
+            {% if userIsSuperUser or (hasOnlyAdminAccess and (access!='noaccess' or idSiteSelected == 'all'))  %}
             <tr>
                 <td id='login'>{{ login }}</td>
                 <td>{{ usersAliasByLogin[login]|raw }}</td>
-- 
cgit v1.2.3


From 0e59d6d5fc41e80ae078fbd53cebedb68e82423f Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Mon, 21 Dec 2015 22:11:24 +1300
Subject: Do not double encode website name

---
 plugins/UsersManager/templates/index.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/UsersManager/templates/index.twig')

diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index be07ac9381..acb6f69edb 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -96,7 +96,7 @@
     <p>
         <button id="showGiveViewAccessForm" class="add-user btn btn-lg btn-flat">
             <span class="icon-add"></span>
-            {{ 'UsersManager_GiveViewAccessTitle'|translate('"' ~ defaultReportSiteName ~ '"') }}
+            {{ 'UsersManager_GiveViewAccessTitle'|translate('"' ~ defaultReportSiteName ~ '"')|raw }}
         </button>
     </p>
     <form id="giveViewAccessForm">
-- 
cgit v1.2.3