From b10ab5a11eb2f1a6cd7da49dde11ce6b10b0bcda Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Thu, 14 Nov 2019 00:55:22 -0100 Subject: adding share type circles Signed-off-by: Maxence Lange --- apps/dav/lib/Connector/PublicAuth.php | 5 ++++- lib/private/Share20/Manager.php | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/dav/lib/Connector/PublicAuth.php b/apps/dav/lib/Connector/PublicAuth.php index 8d29704c970..6b8341f7047 100644 --- a/apps/dav/lib/Connector/PublicAuth.php +++ b/apps/dav/lib/Connector/PublicAuth.php @@ -97,7 +97,10 @@ class PublicAuth extends AbstractBasic { // check if the share is password protected if ($share->getPassword() !== null) { - if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) { + + if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK + || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL + || $share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE) { if ($this->shareManager->checkPassword($share, $password)) { return true; } else if ($this->session->exists('public_link_authenticated') diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php index 6c6ace237b9..7d64d0147a9 100644 --- a/lib/private/Share20/Manager.php +++ b/lib/private/Share20/Manager.php @@ -1329,7 +1329,8 @@ class Manager implements IManager { */ public function checkPassword(\OCP\Share\IShare $share, $password) { $passwordProtected = $share->getShareType() !== \OCP\Share::SHARE_TYPE_LINK - || $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL; + || $share->getShareType() !== \OCP\Share::SHARE_TYPE_EMAIL + || $share->getShareType() !== \OCP\Share::SHARE_TYPE_CIRCLE; if (!$passwordProtected) { //TODO maybe exception? return false; -- cgit v1.2.3 le Mirror of redmine code source: https://github.com/redmine/redminewww-data
summaryrefslogtreecommitdiffstats
path: root/app/views/imports/_users_fields_mapping.html.erb
blob: f2b2aaf90fffebfdb4c2a3fa61f39e9621db4ca4 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53

<div class="splitcontent">
  <div class="splitcontentleft">
  <p>
    <label for="import_mapping_login"><%= l(:field_login) %></label>
    <%= mapping_select_tag @import, 'login', :required => true %>
  </p>
  <p>
    <label for="import_mapping_firstname"><%= l(:field_firstname) %></label>
    <%= mapping_select_tag @import, 'firstname', :required => true %>
  </p>
  <p>
    <label for="import_mapping_lastname"><%= l(:field_lastname) %></label>
    <%= mapping_select_tag @import, 'lastname', :required => true %>
  </p>
  <p>
    <label for="import_mapping_mail"><%= l(:field_mail) %></label>
    <%= mapping_select_tag @import, 'mail' %>
  </p>
  <p>
    <label for="import_mapping_language"><%= l(:field_language) %></label>
    <%= mapping_select_tag @import, 'language' %>
  </p>
  <p>
    <label for="import_mapping_admin"><%= l(:field_admin) %></label>
    <%= mapping_select_tag @import, 'admin' %>
  </p>
  <p>
    <label for="import_mapping_auth_source_id"><%= l(:field_auth_source) %></label>
    <%= mapping_select_tag @import, 'auth_source' %>
  </p>
  <p>
    <label for="import_mapping_password"><%= l(:field_password) %></label>
    <%= mapping_select_tag @import, 'password' %>
  </p>
  <p>
    <label for="import_mapping_must_change_passwd"><%= l(:field_must_change_passwd) %></label>
    <%= mapping_select_tag @import, 'must_change_passwd' %>
  </p>
  <p>
    <label for="import_mapping_status"><%= l(:field_status) %></label>
    <%= mapping_select_tag @import, 'status' %>
  </p>
  </div>

  <div class="splitcontentright">
  <% @custom_fields.each do |field| %>
    <p>
      <label for="import_mapping_cf_<%= field.id %>"><%= field.name %></label>
      <%= mapping_select_tag @import, "cf_#{field.id}", :required => field.is_required? %>
    </p>
  <% end %>
  </div>
</div>