@@ -33,133 +33,133 @@ |
||
33 | 33 | */ |
34 | 34 | interface ISystemTagManager { |
35 | 35 | |
36 | - /** |
|
37 | - * Returns the tag objects matching the given tag ids. |
|
38 | - * |
|
39 | - * @param array|string $tagIds id or array of unique ids of the tag to retrieve |
|
40 | - * |
|
41 | - * @return ISystemTag[] array of system tags with tag id as key |
|
42 | - * |
|
43 | - * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.) |
|
44 | - * @throws TagNotFoundException if at least one given tag ids did no exist |
|
45 | - * The message contains a json_encoded array of the ids that could not be found |
|
46 | - * |
|
47 | - * @since 9.0.0 |
|
48 | - */ |
|
49 | - public function getTagsByIds($tagIds): array; |
|
36 | + /** |
|
37 | + * Returns the tag objects matching the given tag ids. |
|
38 | + * |
|
39 | + * @param array|string $tagIds id or array of unique ids of the tag to retrieve |
|
40 | + * |
|
41 | + * @return ISystemTag[] array of system tags with tag id as key |
|
42 | + * |
|
43 | + * @throws \InvalidArgumentException if at least one given tag ids is invalid (string instead of integer, etc.) |
|
44 | + * @throws TagNotFoundException if at least one given tag ids did no exist |
|
45 | + * The message contains a json_encoded array of the ids that could not be found |
|
46 | + * |
|
47 | + * @since 9.0.0 |
|
48 | + */ |
|
49 | + public function getTagsByIds($tagIds): array; |
|
50 | 50 | |
51 | - /** |
|
52 | - * Returns the tag object matching the given attributes. |
|
53 | - * |
|
54 | - * @param string $tagName tag name |
|
55 | - * @param bool $userVisible whether the tag is visible by users |
|
56 | - * @param bool $userAssignable whether the tag is assignable by users |
|
57 | - * |
|
58 | - * @return ISystemTag system tag |
|
59 | - * |
|
60 | - * @throws TagNotFoundException if tag does not exist |
|
61 | - * |
|
62 | - * @since 9.0.0 |
|
63 | - */ |
|
64 | - public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag; |
|
51 | + /** |
|
52 | + * Returns the tag object matching the given attributes. |
|
53 | + * |
|
54 | + * @param string $tagName tag name |
|
55 | + * @param bool $userVisible whether the tag is visible by users |
|
56 | + * @param bool $userAssignable whether the tag is assignable by users |
|
57 | + * |
|
58 | + * @return ISystemTag system tag |
|
59 | + * |
|
60 | + * @throws TagNotFoundException if tag does not exist |
|
61 | + * |
|
62 | + * @since 9.0.0 |
|
63 | + */ |
|
64 | + public function getTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag; |
|
65 | 65 | |
66 | - /** |
|
67 | - * Creates the tag object using the given attributes. |
|
68 | - * |
|
69 | - * @param string $tagName tag name |
|
70 | - * @param bool $userVisible whether the tag is visible by users |
|
71 | - * @param bool $userAssignable whether the tag is assignable by users |
|
72 | - * |
|
73 | - * @return ISystemTag system tag |
|
74 | - * |
|
75 | - * @throws TagAlreadyExistsException if tag already exists |
|
76 | - * |
|
77 | - * @since 9.0.0 |
|
78 | - */ |
|
79 | - public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag; |
|
66 | + /** |
|
67 | + * Creates the tag object using the given attributes. |
|
68 | + * |
|
69 | + * @param string $tagName tag name |
|
70 | + * @param bool $userVisible whether the tag is visible by users |
|
71 | + * @param bool $userAssignable whether the tag is assignable by users |
|
72 | + * |
|
73 | + * @return ISystemTag system tag |
|
74 | + * |
|
75 | + * @throws TagAlreadyExistsException if tag already exists |
|
76 | + * |
|
77 | + * @since 9.0.0 |
|
78 | + */ |
|
79 | + public function createTag(string $tagName, bool $userVisible, bool $userAssignable): ISystemTag; |
|
80 | 80 | |
81 | - /** |
|
82 | - * Returns all known tags, optionally filtered by visibility. |
|
83 | - * |
|
84 | - * @param bool|null $visibilityFilter filter by visibility if non-null |
|
85 | - * @param string $nameSearchPattern optional search pattern for the tag name |
|
86 | - * |
|
87 | - * @return ISystemTag[] array of system tags or empty array if none found |
|
88 | - * |
|
89 | - * @since 9.0.0 |
|
90 | - */ |
|
91 | - public function getAllTags($visibilityFilter = null, $nameSearchPattern = null): array; |
|
81 | + /** |
|
82 | + * Returns all known tags, optionally filtered by visibility. |
|
83 | + * |
|
84 | + * @param bool|null $visibilityFilter filter by visibility if non-null |
|
85 | + * @param string $nameSearchPattern optional search pattern for the tag name |
|
86 | + * |
|
87 | + * @return ISystemTag[] array of system tags or empty array if none found |
|
88 | + * |
|
89 | + * @since 9.0.0 |
|
90 | + */ |
|
91 | + public function getAllTags($visibilityFilter = null, $nameSearchPattern = null): array; |
|
92 | 92 | |
93 | - /** |
|
94 | - * Updates the given tag |
|
95 | - * |
|
96 | - * @param string $tagId tag id |
|
97 | - * @param string $newName the new tag name |
|
98 | - * @param bool $userVisible whether the tag is visible by users |
|
99 | - * @param bool $userAssignable whether the tag is assignable by users |
|
100 | - * |
|
101 | - * @throws TagNotFoundException if tag with the given id does not exist |
|
102 | - * @throws TagAlreadyExistsException if there is already another tag |
|
103 | - * with the same attributes |
|
104 | - * |
|
105 | - * @since 9.0.0 |
|
106 | - */ |
|
107 | - public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable); |
|
93 | + /** |
|
94 | + * Updates the given tag |
|
95 | + * |
|
96 | + * @param string $tagId tag id |
|
97 | + * @param string $newName the new tag name |
|
98 | + * @param bool $userVisible whether the tag is visible by users |
|
99 | + * @param bool $userAssignable whether the tag is assignable by users |
|
100 | + * |
|
101 | + * @throws TagNotFoundException if tag with the given id does not exist |
|
102 | + * @throws TagAlreadyExistsException if there is already another tag |
|
103 | + * with the same attributes |
|
104 | + * |
|
105 | + * @since 9.0.0 |
|
106 | + */ |
|
107 | + public function updateTag(string $tagId, string $newName, bool $userVisible, bool $userAssignable); |
|
108 | 108 | |
109 | - /** |
|
110 | - * Delete the given tags from the database and all their relationships. |
|
111 | - * |
|
112 | - * @param string|array $tagIds array of tag ids |
|
113 | - * |
|
114 | - * @throws TagNotFoundException if at least one tag did not exist |
|
115 | - * |
|
116 | - * @since 9.0.0 |
|
117 | - */ |
|
118 | - public function deleteTags($tagIds); |
|
109 | + /** |
|
110 | + * Delete the given tags from the database and all their relationships. |
|
111 | + * |
|
112 | + * @param string|array $tagIds array of tag ids |
|
113 | + * |
|
114 | + * @throws TagNotFoundException if at least one tag did not exist |
|
115 | + * |
|
116 | + * @since 9.0.0 |
|
117 | + */ |
|
118 | + public function deleteTags($tagIds); |
|
119 | 119 | |
120 | - /** |
|
121 | - * Checks whether the given user is allowed to assign/unassign the tag with the |
|
122 | - * given id. |
|
123 | - * |
|
124 | - * @param ISystemTag $tag tag to check permission for |
|
125 | - * @param IUser $user user to check permission for |
|
126 | - * |
|
127 | - * @return true if the user is allowed to assign/unassign the tag, false otherwise |
|
128 | - * |
|
129 | - * @since 9.1.0 |
|
130 | - */ |
|
131 | - public function canUserAssignTag(ISystemTag $tag, IUser $user): bool; |
|
120 | + /** |
|
121 | + * Checks whether the given user is allowed to assign/unassign the tag with the |
|
122 | + * given id. |
|
123 | + * |
|
124 | + * @param ISystemTag $tag tag to check permission for |
|
125 | + * @param IUser $user user to check permission for |
|
126 | + * |
|
127 | + * @return true if the user is allowed to assign/unassign the tag, false otherwise |
|
128 | + * |
|
129 | + * @since 9.1.0 |
|
130 | + */ |
|
131 | + public function canUserAssignTag(ISystemTag $tag, IUser $user): bool; |
|
132 | 132 | |
133 | - /** |
|
134 | - * Checks whether the given user is allowed to see the tag with the given id. |
|
135 | - * |
|
136 | - * @param ISystemTag $tag tag to check permission for |
|
137 | - * @param IUser $user user to check permission for |
|
138 | - * |
|
139 | - * @return true if the user can see the tag, false otherwise |
|
140 | - * |
|
141 | - * @since 9.1.0 |
|
142 | - */ |
|
143 | - public function canUserSeeTag(ISystemTag $tag, IUser $user): bool; |
|
133 | + /** |
|
134 | + * Checks whether the given user is allowed to see the tag with the given id. |
|
135 | + * |
|
136 | + * @param ISystemTag $tag tag to check permission for |
|
137 | + * @param IUser $user user to check permission for |
|
138 | + * |
|
139 | + * @return true if the user can see the tag, false otherwise |
|
140 | + * |
|
141 | + * @since 9.1.0 |
|
142 | + */ |
|
143 | + public function canUserSeeTag(ISystemTag $tag, IUser $user): bool; |
|
144 | 144 | |
145 | - /** |
|
146 | - * Set groups that can assign a given tag. |
|
147 | - * |
|
148 | - * @param ISystemTag $tag tag for group assignment |
|
149 | - * @param string[] $groupIds group ids of groups that can assign/unassign the tag |
|
150 | - * |
|
151 | - * @since 9.1.0 |
|
152 | - */ |
|
153 | - public function setTagGroups(ISystemTag $tag, array $groupIds); |
|
145 | + /** |
|
146 | + * Set groups that can assign a given tag. |
|
147 | + * |
|
148 | + * @param ISystemTag $tag tag for group assignment |
|
149 | + * @param string[] $groupIds group ids of groups that can assign/unassign the tag |
|
150 | + * |
|
151 | + * @since 9.1.0 |
|
152 | + */ |
|
153 | + public function setTagGroups(ISystemTag $tag, array $groupIds); |
|
154 | 154 | |
155 | - /** |
|
156 | - * Get groups that can assign a given tag. |
|
157 | - * |
|
158 | - * @param ISystemTag $tag tag for group assignment |
|
159 | - * |
|
160 | - * @return string[] group ids of groups that can assign/unassign the tag |
|
161 | - * |
|
162 | - * @since 9.1.0 |
|
163 | - */ |
|
164 | - public function getTagGroups(ISystemTag $tag): array; |
|
155 | + /** |
|
156 | + * Get groups that can assign a given tag. |
|
157 | + * |
|
158 | + * @param ISystemTag $tag tag for group assignment |
|
159 | + * |
|
160 | + * @return string[] group ids of groups that can assign/unassign the tag |
|
161 | + * |
|
162 | + * @since 9.1.0 |
|
163 | + */ |
|
164 | + public function getTagGroups(ISystemTag $tag): array; |
|
165 | 165 | } |
@@ -32,28 +32,28 @@ |
||
32 | 32 | */ |
33 | 33 | class TagNotFoundException extends \RuntimeException { |
34 | 34 | |
35 | - /** @var string[] */ |
|
36 | - protected $tags; |
|
35 | + /** @var string[] */ |
|
36 | + protected $tags; |
|
37 | 37 | |
38 | - /** |
|
39 | - * TagNotFoundException constructor. |
|
40 | - * |
|
41 | - * @param string $message |
|
42 | - * @param int $code |
|
43 | - * @param \Exception|null $previous |
|
44 | - * @param string[] $tags |
|
45 | - * @since 9.0.0 |
|
46 | - */ |
|
47 | - public function __construct(string $message = '', int $code = 0, \Exception $previous = null, array $tags = []) { |
|
48 | - parent::__construct($message, $code, $previous); |
|
49 | - $this->tags = $tags; |
|
50 | - } |
|
38 | + /** |
|
39 | + * TagNotFoundException constructor. |
|
40 | + * |
|
41 | + * @param string $message |
|
42 | + * @param int $code |
|
43 | + * @param \Exception|null $previous |
|
44 | + * @param string[] $tags |
|
45 | + * @since 9.0.0 |
|
46 | + */ |
|
47 | + public function __construct(string $message = '', int $code = 0, \Exception $previous = null, array $tags = []) { |
|
48 | + parent::__construct($message, $code, $previous); |
|
49 | + $this->tags = $tags; |
|
50 | + } |
|
51 | 51 | |
52 | - /** |
|
53 | - * @return string[] |
|
54 | - * @since 9.0.0 |
|
55 | - */ |
|
56 | - public function getMissingTags(): array { |
|
57 | - return $this->tags; |
|
58 | - } |
|
52 | + /** |
|
53 | + * @return string[] |
|
54 | + * @since 9.0.0 |
|
55 | + */ |
|
56 | + public function getMissingTags(): array { |
|
57 | + return $this->tags; |
|
58 | + } |
|
59 | 59 | } |
@@ -30,41 +30,41 @@ |
||
30 | 30 | */ |
31 | 31 | interface ISystemTag { |
32 | 32 | |
33 | - /** |
|
34 | - * Returns the tag id |
|
35 | - * |
|
36 | - * @return string id |
|
37 | - * |
|
38 | - * @since 9.0.0 |
|
39 | - */ |
|
40 | - public function getId(): string; |
|
33 | + /** |
|
34 | + * Returns the tag id |
|
35 | + * |
|
36 | + * @return string id |
|
37 | + * |
|
38 | + * @since 9.0.0 |
|
39 | + */ |
|
40 | + public function getId(): string; |
|
41 | 41 | |
42 | - /** |
|
43 | - * Returns the tag display name |
|
44 | - * |
|
45 | - * @return string tag display name |
|
46 | - * |
|
47 | - * @since 9.0.0 |
|
48 | - */ |
|
49 | - public function getName(): string; |
|
42 | + /** |
|
43 | + * Returns the tag display name |
|
44 | + * |
|
45 | + * @return string tag display name |
|
46 | + * |
|
47 | + * @since 9.0.0 |
|
48 | + */ |
|
49 | + public function getName(): string; |
|
50 | 50 | |
51 | - /** |
|
52 | - * Returns whether the tag is visible for regular users |
|
53 | - * |
|
54 | - * @return bool true if visible, false otherwise |
|
55 | - * |
|
56 | - * @since 9.0.0 |
|
57 | - */ |
|
58 | - public function isUserVisible(): bool; |
|
51 | + /** |
|
52 | + * Returns whether the tag is visible for regular users |
|
53 | + * |
|
54 | + * @return bool true if visible, false otherwise |
|
55 | + * |
|
56 | + * @since 9.0.0 |
|
57 | + */ |
|
58 | + public function isUserVisible(): bool; |
|
59 | 59 | |
60 | - /** |
|
61 | - * Returns whether the tag can be assigned to objects by regular users |
|
62 | - * |
|
63 | - * @return bool true if assignable, false otherwise |
|
64 | - * |
|
65 | - * @since 9.0.0 |
|
66 | - */ |
|
67 | - public function isUserAssignable(): bool; |
|
60 | + /** |
|
61 | + * Returns whether the tag can be assigned to objects by regular users |
|
62 | + * |
|
63 | + * @return bool true if assignable, false otherwise |
|
64 | + * |
|
65 | + * @since 9.0.0 |
|
66 | + */ |
|
67 | + public function isUserAssignable(): bool; |
|
68 | 68 | |
69 | 69 | } |
70 | 70 |
@@ -28,66 +28,66 @@ |
||
28 | 28 | |
29 | 29 | class SystemTag implements ISystemTag { |
30 | 30 | |
31 | - /** |
|
32 | - * @var string |
|
33 | - */ |
|
34 | - private $id; |
|
31 | + /** |
|
32 | + * @var string |
|
33 | + */ |
|
34 | + private $id; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @var string |
|
38 | - */ |
|
39 | - private $name; |
|
36 | + /** |
|
37 | + * @var string |
|
38 | + */ |
|
39 | + private $name; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @var bool |
|
43 | - */ |
|
44 | - private $userVisible; |
|
41 | + /** |
|
42 | + * @var bool |
|
43 | + */ |
|
44 | + private $userVisible; |
|
45 | 45 | |
46 | - /** |
|
47 | - * @var bool |
|
48 | - */ |
|
49 | - private $userAssignable; |
|
46 | + /** |
|
47 | + * @var bool |
|
48 | + */ |
|
49 | + private $userAssignable; |
|
50 | 50 | |
51 | - /** |
|
52 | - * Constructor. |
|
53 | - * |
|
54 | - * @param string $id tag id |
|
55 | - * @param string $name tag name |
|
56 | - * @param bool $userVisible whether the tag is user visible |
|
57 | - * @param bool $userAssignable whether the tag is user assignable |
|
58 | - */ |
|
59 | - public function __construct(string $id, string $name, bool $userVisible, bool $userAssignable) { |
|
60 | - $this->id = $id; |
|
61 | - $this->name = $name; |
|
62 | - $this->userVisible = $userVisible; |
|
63 | - $this->userAssignable = $userAssignable; |
|
64 | - } |
|
51 | + /** |
|
52 | + * Constructor. |
|
53 | + * |
|
54 | + * @param string $id tag id |
|
55 | + * @param string $name tag name |
|
56 | + * @param bool $userVisible whether the tag is user visible |
|
57 | + * @param bool $userAssignable whether the tag is user assignable |
|
58 | + */ |
|
59 | + public function __construct(string $id, string $name, bool $userVisible, bool $userAssignable) { |
|
60 | + $this->id = $id; |
|
61 | + $this->name = $name; |
|
62 | + $this->userVisible = $userVisible; |
|
63 | + $this->userAssignable = $userAssignable; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * {@inheritdoc} |
|
68 | - */ |
|
69 | - public function getId(): string { |
|
70 | - return $this->id; |
|
71 | - } |
|
66 | + /** |
|
67 | + * {@inheritdoc} |
|
68 | + */ |
|
69 | + public function getId(): string { |
|
70 | + return $this->id; |
|
71 | + } |
|
72 | 72 | |
73 | - /** |
|
74 | - * {@inheritdoc} |
|
75 | - */ |
|
76 | - public function getName(): string { |
|
77 | - return $this->name; |
|
78 | - } |
|
73 | + /** |
|
74 | + * {@inheritdoc} |
|
75 | + */ |
|
76 | + public function getName(): string { |
|
77 | + return $this->name; |
|
78 | + } |
|
79 | 79 | |
80 | - /** |
|
81 | - * {@inheritdoc} |
|
82 | - */ |
|
83 | - public function isUserVisible(): bool { |
|
84 | - return $this->userVisible; |
|
85 | - } |
|
80 | + /** |
|
81 | + * {@inheritdoc} |
|
82 | + */ |
|
83 | + public function isUserVisible(): bool { |
|
84 | + return $this->userVisible; |
|
85 | + } |
|
86 | 86 | |
87 | - /** |
|
88 | - * {@inheritdoc} |
|
89 | - */ |
|
90 | - public function isUserAssignable(): bool { |
|
91 | - return $this->userAssignable; |
|
92 | - } |
|
87 | + /** |
|
88 | + * {@inheritdoc} |
|
89 | + */ |
|
90 | + public function isUserAssignable(): bool { |
|
91 | + return $this->userAssignable; |
|
92 | + } |
|
93 | 93 | } |
@@ -36,48 +36,48 @@ |
||
36 | 36 | */ |
37 | 37 | class ManagerFactory implements ISystemTagManagerFactory { |
38 | 38 | |
39 | - /** |
|
40 | - * Server container |
|
41 | - * |
|
42 | - * @var IServerContainer |
|
43 | - */ |
|
44 | - private $serverContainer; |
|
39 | + /** |
|
40 | + * Server container |
|
41 | + * |
|
42 | + * @var IServerContainer |
|
43 | + */ |
|
44 | + private $serverContainer; |
|
45 | 45 | |
46 | - /** |
|
47 | - * Constructor for the system tag manager factory |
|
48 | - * |
|
49 | - * @param IServerContainer $serverContainer server container |
|
50 | - */ |
|
51 | - public function __construct(IServerContainer $serverContainer) { |
|
52 | - $this->serverContainer = $serverContainer; |
|
53 | - } |
|
46 | + /** |
|
47 | + * Constructor for the system tag manager factory |
|
48 | + * |
|
49 | + * @param IServerContainer $serverContainer server container |
|
50 | + */ |
|
51 | + public function __construct(IServerContainer $serverContainer) { |
|
52 | + $this->serverContainer = $serverContainer; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Creates and returns an instance of the system tag manager |
|
57 | - * |
|
58 | - * @return ISystemTagManager |
|
59 | - * @since 9.0.0 |
|
60 | - */ |
|
61 | - public function getManager(): ISystemTagManager { |
|
62 | - return new SystemTagManager( |
|
63 | - $this->serverContainer->getDatabaseConnection(), |
|
64 | - $this->serverContainer->getGroupManager(), |
|
65 | - $this->serverContainer->getEventDispatcher() |
|
66 | - ); |
|
67 | - } |
|
55 | + /** |
|
56 | + * Creates and returns an instance of the system tag manager |
|
57 | + * |
|
58 | + * @return ISystemTagManager |
|
59 | + * @since 9.0.0 |
|
60 | + */ |
|
61 | + public function getManager(): ISystemTagManager { |
|
62 | + return new SystemTagManager( |
|
63 | + $this->serverContainer->getDatabaseConnection(), |
|
64 | + $this->serverContainer->getGroupManager(), |
|
65 | + $this->serverContainer->getEventDispatcher() |
|
66 | + ); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * Creates and returns an instance of the system tag object |
|
71 | - * mapper |
|
72 | - * |
|
73 | - * @return ISystemTagObjectMapper |
|
74 | - * @since 9.0.0 |
|
75 | - */ |
|
76 | - public function getObjectMapper(): ISystemTagObjectMapper { |
|
77 | - return new SystemTagObjectMapper( |
|
78 | - $this->serverContainer->getDatabaseConnection(), |
|
79 | - $this->getManager(), |
|
80 | - $this->serverContainer->getEventDispatcher() |
|
81 | - ); |
|
82 | - } |
|
69 | + /** |
|
70 | + * Creates and returns an instance of the system tag object |
|
71 | + * mapper |
|
72 | + * |
|
73 | + * @return ISystemTagObjectMapper |
|
74 | + * @since 9.0.0 |
|
75 | + */ |
|
76 | + public function getObjectMapper(): ISystemTagObjectMapper { |
|
77 | + return new SystemTagObjectMapper( |
|
78 | + $this->serverContainer->getDatabaseConnection(), |
|
79 | + $this->getManager(), |
|
80 | + $this->serverContainer->getEventDispatcher() |
|
81 | + ); |
|
82 | + } |
|
83 | 83 | } |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <fieldset id="ldapWizard2"> |
2 | 2 | <div> |
3 | 3 | <p> |
4 | - <?php p($l->t('Listing and searching for users is constrained by these criteria:'));?> |
|
4 | + <?php p($l->t('Listing and searching for users is constrained by these criteria:')); ?> |
|
5 | 5 | </p> |
6 | 6 | <p> |
7 | 7 | <label for="ldap_userfilter_objectclass"> |
8 | - <?php p($l->t('Only these object classes:'));?> |
|
8 | + <?php p($l->t('Only these object classes:')); ?> |
|
9 | 9 | </label> |
10 | 10 | |
11 | 11 | <select id="ldap_userfilter_objectclass" multiple="multiple" |
@@ -14,14 +14,14 @@ discard block |
||
14 | 14 | </p> |
15 | 15 | <p> |
16 | 16 | <label></label> |
17 | - <span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.'));?></span> |
|
17 | + <span class="ldapInputColElement"><?php p($l->t('The most common object classes for users are organizationalPerson, person, user, and inetOrgPerson. If you are not sure which object class to select, please consult your directory admin.')); ?></span> |
|
18 | 18 | </p> |
19 | 19 | <p> |
20 | 20 | <label for="ldap_userfilter_groups"> |
21 | - <?php p($l->t('Only from these groups:'));?> |
|
21 | + <?php p($l->t('Only from these groups:')); ?> |
|
22 | 22 | </label> |
23 | 23 | |
24 | - <input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" /> |
|
24 | + <input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" /> |
|
25 | 25 | |
26 | 26 | <select id="ldap_userfilter_groups" multiple="multiple" |
27 | 27 | name="ldap_userfilter_groups" class="multiSelectPlugin"> |
@@ -30,26 +30,26 @@ discard block |
||
30 | 30 | <p class="ldapManyGroupsSupport hidden"> |
31 | 31 | <label></label> |
32 | 32 | <select class="ldapGroupList ldapGroupListAvailable" multiple="multiple" |
33 | - title="<?php p($l->t('Available groups'));?>"></select> |
|
33 | + title="<?php p($l->t('Available groups')); ?>"></select> |
|
34 | 34 | <span class="buttonSpan"> |
35 | 35 | <button class="ldapGroupListSelect" type="button">></button><br/> |
36 | 36 | <button class="ldapGroupListDeselect" type="button"><</button> |
37 | 37 | </span> |
38 | 38 | <select class="ldapGroupList ldapGroupListSelected" multiple="multiple" |
39 | - title="<?php p($l->t('Selected groups'));?>"></select> |
|
39 | + title="<?php p($l->t('Selected groups')); ?>"></select> |
|
40 | 40 | </p> |
41 | 41 | <p> |
42 | - <label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label> |
|
42 | + <label><a id='toggleRawUserFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label> |
|
43 | 43 | </p> |
44 | 44 | <p id="ldapReadOnlyUserFilterContainer" class="hidden ldapReadOnlyFilterContainer"> |
45 | - <label><?php p($l->t('LDAP Filter:'));?></label> |
|
45 | + <label><?php p($l->t('LDAP Filter:')); ?></label> |
|
46 | 46 | <span class="ldapFilterReadOnlyElement ldapInputColElement"></span> |
47 | 47 | </p> |
48 | 48 | <p id="rawUserFilterContainer"> |
49 | 49 | <textarea type="text" id="ldap_userlist_filter" name="ldap_userlist_filter" |
50 | 50 | class="ldapFilterInputElement" |
51 | - placeholder="<?php p($l->t('Edit LDAP Query'));?>" |
|
52 | - title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()]));?>"> |
|
51 | + placeholder="<?php p($l->t('Edit LDAP Query')); ?>" |
|
52 | + title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', [$theme->getName()])); ?>"> |
|
53 | 53 | </textarea> |
54 | 54 | </p> |
55 | 55 | <p> |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | </p> |
58 | 58 | <p class="ldap_count"> |
59 | 59 | <button class="ldapGetEntryCount ldapGetUserCount" name="ldapGetEntryCount" type="button"> |
60 | - <?php p($l->t('Verify settings and count users'));?> |
|
60 | + <?php p($l->t('Verify settings and count users')); ?> |
|
61 | 61 | </button> |
62 | 62 | <span id="ldap_user_count"></span> |
63 | 63 | </p> |
@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <fieldset id="ldapWizard4"> |
2 | 2 | <div> |
3 | 3 | <p> |
4 | - <?php p($l->t('Groups meeting these criteria are available in %s:', [$theme->getName()]));?> |
|
4 | + <?php p($l->t('Groups meeting these criteria are available in %s:', [$theme->getName()])); ?> |
|
5 | 5 | </p> |
6 | 6 | <p> |
7 | 7 | <label for="ldap_groupfilter_objectclass"> |
8 | - <?php p($l->t('Only these object classes:'));?> |
|
8 | + <?php p($l->t('Only these object classes:')); ?> |
|
9 | 9 | </label> |
10 | 10 | |
11 | 11 | <select id="ldap_groupfilter_objectclass" multiple="multiple" |
@@ -14,10 +14,10 @@ discard block |
||
14 | 14 | </p> |
15 | 15 | <p> |
16 | 16 | <label for="ldap_groupfilter_groups"> |
17 | - <?php p($l->t('Only from these groups:'));?> |
|
17 | + <?php p($l->t('Only from these groups:')); ?> |
|
18 | 18 | </label> |
19 | 19 | |
20 | - <input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups'));?>" /> |
|
20 | + <input type="text" class="ldapManyGroupsSupport ldapManyGroupsSearch hidden" placeholder="<?php p($l->t('Search groups')); ?>" /> |
|
21 | 21 | |
22 | 22 | <select id="ldap_groupfilter_groups" multiple="multiple" |
23 | 23 | name="ldap_groupfilter_groups" class="multiSelectPlugin"> |
@@ -27,25 +27,25 @@ discard block |
||
27 | 27 | <p class="ldapManyGroupsSupport hidden"> |
28 | 28 | <label></label> |
29 | 29 | <select class="ldapGroupList ldapGroupListAvailable" multiple="multiple" |
30 | - title="<?php p($l->t('Available groups'));?>"></select> |
|
30 | + title="<?php p($l->t('Available groups')); ?>"></select> |
|
31 | 31 | <span class="buttonSpan"> |
32 | 32 | <button class="ldapGroupListSelect" type="button">></button><br/> |
33 | 33 | <button class="ldapGroupListDeselect" type="button"><</button> |
34 | 34 | </span> |
35 | 35 | <select class="ldapGroupList ldapGroupListSelected" multiple="multiple" |
36 | - title="<?php p($l->t('Selected groups'));?>"></select> |
|
36 | + title="<?php p($l->t('Selected groups')); ?>"></select> |
|
37 | 37 | </p> |
38 | 38 | <p> |
39 | - <label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label> |
|
39 | + <label><a id='toggleRawGroupFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label> |
|
40 | 40 | </p> |
41 | 41 | <p id="ldapReadOnlyGroupFilterContainer" class="hidden ldapReadOnlyFilterContainer"> |
42 | - <label><?php p($l->t('LDAP Filter:'));?></label> |
|
42 | + <label><?php p($l->t('LDAP Filter:')); ?></label> |
|
43 | 43 | <span class="ldapFilterReadOnlyElement ldapInputColElement"></span> |
44 | 44 | </p> |
45 | 45 | <p id="rawGroupFilterContainer" class="invisible"> |
46 | 46 | <textarea type="text" id="ldap_group_filter" name="ldap_group_filter" |
47 | - placeholder="<?php p($l->t('Edit LDAP Query'));?>" |
|
48 | - title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()]));?>"> |
|
47 | + placeholder="<?php p($l->t('Edit LDAP Query')); ?>" |
|
48 | + title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', [$theme->getName()])); ?>"> |
|
49 | 49 | </textarea> |
50 | 50 | </p> |
51 | 51 | <p> |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | </p> |
54 | 54 | <p class="ldap_count"> |
55 | 55 | <button class="ldapGetEntryCount ldapGetGroupCount" name="ldapGetEntryCount" type="button"> |
56 | - <?php p($l->t('Verify settings and count the groups'));?> |
|
56 | + <?php p($l->t('Verify settings and count the groups')); ?> |
|
57 | 57 | </button> |
58 | 58 | <span id="ldap_group_count"></span> |
59 | 59 | </p> |
@@ -1,29 +1,29 @@ discard block |
||
1 | 1 | <fieldset id="ldapWizard3"> |
2 | 2 | <div> |
3 | 3 | <p> |
4 | - <?php p($l->t('When logging in, %s will find the user based on the following attributes:', [$theme->getName()]));?> |
|
4 | + <?php p($l->t('When logging in, %s will find the user based on the following attributes:', [$theme->getName()])); ?> |
|
5 | 5 | </p> |
6 | 6 | <p> |
7 | 7 | <label for="ldap_loginfilter_username"> |
8 | - <?php p($l->t('LDAP / AD Username:'));?> |
|
8 | + <?php p($l->t('LDAP / AD Username:')); ?> |
|
9 | 9 | </label> |
10 | 10 | |
11 | 11 | <input type="checkbox" id="ldap_loginfilter_username" |
12 | - title="<?php p($l->t('Allows login against the LDAP / AD username, which is either "uid" or "sAMAccountName" and will be detected.'));?>" |
|
12 | + title="<?php p($l->t('Allows login against the LDAP / AD username, which is either "uid" or "sAMAccountName" and will be detected.')); ?>" |
|
13 | 13 | name="ldap_loginfilter_username" value="1" /> |
14 | 14 | </p> |
15 | 15 | <p> |
16 | 16 | <label for="ldap_loginfilter_email"> |
17 | - <?php p($l->t('LDAP / AD Email Address:'));?> |
|
17 | + <?php p($l->t('LDAP / AD Email Address:')); ?> |
|
18 | 18 | </label> |
19 | 19 | |
20 | 20 | <input type="checkbox" id="ldap_loginfilter_email" |
21 | - title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.'));?>" |
|
21 | + title="<?php p($l->t('Allows login against an email attribute. "mail" and "mailPrimaryAddress" allowed.')); ?>" |
|
22 | 22 | name="ldap_loginfilter_email" value="1" /> |
23 | 23 | </p> |
24 | 24 | <p> |
25 | 25 | <label for="ldap_loginfilter_attributes"> |
26 | - <?php p($l->t('Other Attributes:'));?> |
|
26 | + <?php p($l->t('Other Attributes:')); ?> |
|
27 | 27 | </label> |
28 | 28 | |
29 | 29 | <select id="ldap_loginfilter_attributes" multiple="multiple" |
@@ -31,17 +31,17 @@ discard block |
||
31 | 31 | </select> |
32 | 32 | </p> |
33 | 33 | <p> |
34 | - <label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query'));?></a></label> |
|
34 | + <label><a id='toggleRawLoginFilter' class='ldapToggle'>↓ <?php p($l->t('Edit LDAP Query')); ?></a></label> |
|
35 | 35 | </p> |
36 | 36 | <p id="ldapReadOnlyLoginFilterContainer" class="hidden ldapReadOnlyFilterContainer"> |
37 | - <label><?php p($l->t('LDAP Filter:'));?></label> |
|
37 | + <label><?php p($l->t('LDAP Filter:')); ?></label> |
|
38 | 38 | <span class="ldapFilterReadOnlyElement ldapInputColElement"></span> |
39 | 39 | </p> |
40 | 40 | <p id="rawLoginFilterContainer" class="invisible"> |
41 | 41 | <textarea type="text" id="ldap_login_filter" name="ldap_login_filter" |
42 | 42 | class="ldapFilterInputElement" |
43 | - placeholder="<?php p($l->t('Edit LDAP Query'));?>" |
|
44 | - title="<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"'));?>"> |
|
43 | + placeholder="<?php p($l->t('Edit LDAP Query')); ?>" |
|
44 | + title="<?php p($l->t('Defines the filter to apply, when login is attempted. "%%uid" replaces the username in the login action. Example: "uid=%%uid"')); ?>"> |
|
45 | 45 | </textarea> |
46 | 46 | </p> |
47 | 47 | <p> |
@@ -49,11 +49,11 @@ discard block |
||
49 | 49 | </p> |
50 | 50 | <p class="ldap_verify"> |
51 | 51 | <input type="text" id="ldap_test_loginname" name="ldap_test_loginname" |
52 | - placeholder="<?php p($l->t('Test Loginname'));?>" |
|
52 | + placeholder="<?php p($l->t('Test Loginname')); ?>" |
|
53 | 53 | class="ldapVerifyInput" |
54 | 54 | title="Attempts to receive a DN for the given loginname and the current login filter"/> |
55 | 55 | <button class="ldapVerifyLoginName" name="ldapTestLoginSettings" type="button" disabled="disabled"> |
56 | - <?php p($l->t('Verify settings'));?> |
|
56 | + <?php p($l->t('Verify settings')); ?> |
|
57 | 57 | </button> |
58 | 58 | </p> |
59 | 59 | <?php print_unescaped($_['wizardControls']); ?> |
@@ -36,7 +36,7 @@ |
||
36 | 36 | * @package OC\AppFramework\Middleware\Security\Exceptions |
37 | 37 | */ |
38 | 38 | class NotAdminException extends SecurityException { |
39 | - public function __construct(string $message) { |
|
40 | - parent::__construct($message, Http::STATUS_FORBIDDEN); |
|
41 | - } |
|
39 | + public function __construct(string $message) { |
|
40 | + parent::__construct($message, Http::STATUS_FORBIDDEN); |
|
41 | + } |
|
42 | 42 | } |