@@ -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> |
@@ -9,19 +9,19 @@ |
||
9 | 9 | <p> |
10 | 10 | <select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser"> |
11 | 11 | <?php if(count($_['serverConfigurationPrefixes']) === 0 ) { |
12 | - ?> |
|
12 | + ?> |
|
13 | 13 | <option value="" selected><?php p($l->t('1. Server'));?></option>'); |
14 | 14 | <?php |
15 | - } else { |
|
16 | - $i = 1; |
|
17 | - $sel = ' selected'; |
|
18 | - foreach($_['serverConfigurationPrefixes'] as $prefix) { |
|
19 | - ?> |
|
15 | + } else { |
|
16 | + $i = 1; |
|
17 | + $sel = ' selected'; |
|
18 | + foreach($_['serverConfigurationPrefixes'] as $prefix) { |
|
19 | + ?> |
|
20 | 20 | <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> |
21 | 21 | <?php |
22 | - } |
|
23 | - } |
|
24 | - ?> |
|
22 | + } |
|
23 | + } |
|
24 | + ?> |
|
25 | 25 | </select> |
26 | 26 | <button type="button" id="ldap_action_add_configuration" |
27 | 27 | name="ldap_action_add_configuration" class="icon-add icon-default-style" |
@@ -8,16 +8,16 @@ discard block |
||
8 | 8 | <fieldset id="ldapWizard1"> |
9 | 9 | <p> |
10 | 10 | <select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser"> |
11 | - <?php if(count($_['serverConfigurationPrefixes']) === 0 ) { |
|
11 | + <?php if (count($_['serverConfigurationPrefixes']) === 0) { |
|
12 | 12 | ?> |
13 | - <option value="" selected><?php p($l->t('1. Server'));?></option>'); |
|
13 | + <option value="" selected><?php p($l->t('1. Server')); ?></option>'); |
|
14 | 14 | <?php |
15 | 15 | } else { |
16 | 16 | $i = 1; |
17 | 17 | $sel = ' selected'; |
18 | - foreach($_['serverConfigurationPrefixes'] as $prefix) { |
|
18 | + foreach ($_['serverConfigurationPrefixes'] as $prefix) { |
|
19 | 19 | ?> |
20 | - <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> |
|
20 | + <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++))); ?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> |
|
21 | 21 | <?php |
22 | 22 | } |
23 | 23 | } |
@@ -25,14 +25,14 @@ discard block |
||
25 | 25 | </select> |
26 | 26 | <button type="button" id="ldap_action_add_configuration" |
27 | 27 | name="ldap_action_add_configuration" class="icon-add icon-default-style" |
28 | - title="<?php p($l->t('Add a new configuration'));?>"> </button> |
|
28 | + title="<?php p($l->t('Add a new configuration')); ?>"> </button> |
|
29 | 29 | <button type="button" id="ldap_action_copy_configuration" |
30 | 30 | name="ldap_action_copy_configuration" |
31 | 31 | class="ldapIconCopy icon-default-style" |
32 | - title="<?php p($l->t('Copy current configuration into new directory binding'));?>"> </button> |
|
32 | + title="<?php p($l->t('Copy current configuration into new directory binding')); ?>"> </button> |
|
33 | 33 | <button type="button" id="ldap_action_delete_configuration" |
34 | 34 | name="ldap_action_delete_configuration" class="icon-delete icon-default-style" |
35 | - title="<?php p($l->t('Delete the current configuration'));?>"> </button> |
|
35 | + title="<?php p($l->t('Delete the current configuration')); ?>"> </button> |
|
36 | 36 | </p> |
37 | 37 | |
38 | 38 | <div class="hostPortCombinator"> |
@@ -41,14 +41,14 @@ discard block |
||
41 | 41 | <div class="table"> |
42 | 42 | <input type="text" class="host" id="ldap_host" |
43 | 43 | name="ldap_host" |
44 | - placeholder="<?php p($l->t('Host'));?>" |
|
45 | - title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>" |
|
44 | + placeholder="<?php p($l->t('Host')); ?>" |
|
45 | + title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://')); ?>" |
|
46 | 46 | /> |
47 | 47 | <span class="hostPortCombinatorSpan"> |
48 | 48 | <input type="number" id="ldap_port" name="ldap_port" |
49 | - placeholder="<?php p($l->t('Port'));?>" /> |
|
49 | + placeholder="<?php p($l->t('Port')); ?>" /> |
|
50 | 50 | <button class="ldapDetectPort" name="ldapDetectPort" type="button"> |
51 | - <?php p($l->t('Detect Port'));?> |
|
51 | + <?php p($l->t('Detect Port')); ?> |
|
52 | 52 | </button> |
53 | 53 | </span> |
54 | 54 | </div> |
@@ -57,40 +57,40 @@ discard block |
||
57 | 57 | <div class="tablerow"> |
58 | 58 | <input type="text" id="ldap_dn" name="ldap_dn" |
59 | 59 | class="tablecell" |
60 | - placeholder="<?php p($l->t('User DN'));?>" autocomplete="off" |
|
61 | - title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.'));?>" |
|
60 | + placeholder="<?php p($l->t('User DN')); ?>" autocomplete="off" |
|
61 | + title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?>" |
|
62 | 62 | /> |
63 | 63 | </div> |
64 | 64 | |
65 | 65 | <div class="tablerow"> |
66 | 66 | <input type="password" id="ldap_agent_password" |
67 | 67 | class="tablecell" name="ldap_agent_password" |
68 | - placeholder="<?php p($l->t('Password'));?>" autocomplete="off" |
|
69 | - title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>" |
|
68 | + placeholder="<?php p($l->t('Password')); ?>" autocomplete="off" |
|
69 | + title="<?php p($l->t('For anonymous access, leave DN and Password empty.')); ?>" |
|
70 | 70 | /> |
71 | 71 | </div> |
72 | 72 | |
73 | 73 | <div class="tablerow"> |
74 | 74 | <textarea id="ldap_base" name="ldap_base" |
75 | 75 | class="tablecell" |
76 | - placeholder="<?php p($l->t('One Base DN per line'));?>" |
|
77 | - title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>"> |
|
76 | + placeholder="<?php p($l->t('One Base DN per line')); ?>" |
|
77 | + title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab')); ?>"> |
|
78 | 78 | </textarea> |
79 | 79 | <button class="ldapDetectBase" name="ldapDetectBase" type="button"> |
80 | - <?php p($l->t('Detect Base DN'));?> |
|
80 | + <?php p($l->t('Detect Base DN')); ?> |
|
81 | 81 | </button> |
82 | 82 | <button class="ldapTestBase" name="ldapTestBase" type="button"> |
83 | - <?php p($l->t('Test Base DN'));?> |
|
83 | + <?php p($l->t('Test Base DN')); ?> |
|
84 | 84 | </button> |
85 | 85 | </div> |
86 | 86 | |
87 | 87 | <div class="tablerow left"> |
88 | 88 | <input type="checkbox" id="ldap_experienced_admin" value="1" |
89 | 89 | name="ldap_experienced_admin" class="tablecell" |
90 | - title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>" |
|
90 | + title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>" |
|
91 | 91 | /> |
92 | 92 | <label for="ldap_experienced_admin" class="tablecell"> |
93 | - <?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?> |
|
93 | + <?php p($l->t('Manually enter LDAP filters (recommended for large directories)')); ?> |
|
94 | 94 | </label> |
95 | 95 | </div> |
96 | 96 |
@@ -34,16 +34,16 @@ |
||
34 | 34 | $subject = (string)$_POST['ldap_clear_mapping']; |
35 | 35 | $mapping = null; |
36 | 36 | if($subject === 'user') { |
37 | - $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); |
|
37 | + $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); |
|
38 | 38 | } else if($subject === 'group') { |
39 | - $mapping = new GroupMapping(\OC::$server->getDatabaseConnection()); |
|
39 | + $mapping = new GroupMapping(\OC::$server->getDatabaseConnection()); |
|
40 | 40 | } |
41 | 41 | try { |
42 | - if(is_null($mapping) || !$mapping->clear()) { |
|
43 | - $l = \OC::$server->getL10N('user_ldap'); |
|
44 | - throw new \Exception($l->t('Failed to clear the mappings.')); |
|
45 | - } |
|
46 | - OCP\JSON::success(); |
|
42 | + if(is_null($mapping) || !$mapping->clear()) { |
|
43 | + $l = \OC::$server->getL10N('user_ldap'); |
|
44 | + throw new \Exception($l->t('Failed to clear the mappings.')); |
|
45 | + } |
|
46 | + OCP\JSON::success(); |
|
47 | 47 | } catch (\Exception $e) { |
48 | - OCP\JSON::error(array('message' => $e->getMessage())); |
|
48 | + OCP\JSON::error(array('message' => $e->getMessage())); |
|
49 | 49 | } |
@@ -31,15 +31,15 @@ |
||
31 | 31 | OCP\JSON::checkAppEnabled('user_ldap'); |
32 | 32 | OCP\JSON::callCheck(); |
33 | 33 | |
34 | -$subject = (string)$_POST['ldap_clear_mapping']; |
|
34 | +$subject = (string) $_POST['ldap_clear_mapping']; |
|
35 | 35 | $mapping = null; |
36 | -if($subject === 'user') { |
|
36 | +if ($subject === 'user') { |
|
37 | 37 | $mapping = new UserMapping(\OC::$server->getDatabaseConnection()); |
38 | -} else if($subject === 'group') { |
|
38 | +} else if ($subject === 'group') { |
|
39 | 39 | $mapping = new GroupMapping(\OC::$server->getDatabaseConnection()); |
40 | 40 | } |
41 | 41 | try { |
42 | - if(is_null($mapping) || !$mapping->clear()) { |
|
42 | + if (is_null($mapping) || !$mapping->clear()) { |
|
43 | 43 | $l = \OC::$server->getL10N('user_ldap'); |
44 | 44 | throw new \Exception($l->t('Failed to clear the mappings.')); |
45 | 45 | } |
@@ -37,24 +37,24 @@ discard block |
||
37 | 37 | |
38 | 38 | |
39 | 39 | try { |
40 | - $configurationOk = true; |
|
41 | - $conf = $connection->getConfiguration(); |
|
42 | - if ($conf['ldap_configuration_active'] === '0') { |
|
43 | - //needs to be true, otherwise it will also fail with an irritating message |
|
44 | - $conf['ldap_configuration_active'] = '1'; |
|
45 | - $configurationOk = $connection->setConfiguration($conf); |
|
46 | - } |
|
47 | - if ($configurationOk) { |
|
48 | - //Configuration is okay |
|
49 | - /* |
|
40 | + $configurationOk = true; |
|
41 | + $conf = $connection->getConfiguration(); |
|
42 | + if ($conf['ldap_configuration_active'] === '0') { |
|
43 | + //needs to be true, otherwise it will also fail with an irritating message |
|
44 | + $conf['ldap_configuration_active'] = '1'; |
|
45 | + $configurationOk = $connection->setConfiguration($conf); |
|
46 | + } |
|
47 | + if ($configurationOk) { |
|
48 | + //Configuration is okay |
|
49 | + /* |
|
50 | 50 | * Clossing the session since it won't be used from this point on. There might be a potential |
51 | 51 | * race condition if a second request is made: either this request or the other might not |
52 | 52 | * contact the LDAP backup server the first time when it should, but there shouldn't be any |
53 | 53 | * problem with that other than the extra connection. |
54 | 54 | */ |
55 | - \OC::$server->getSession()->close(); |
|
56 | - if ($connection->bind()) { |
|
57 | - /* |
|
55 | + \OC::$server->getSession()->close(); |
|
56 | + if ($connection->bind()) { |
|
57 | + /* |
|
58 | 58 | * This shiny if block is an ugly hack to find out whether anonymous |
59 | 59 | * bind is possible on AD or not. Because AD happily and constantly |
60 | 60 | * replies with success to any anonymous bind request, we need to |
@@ -63,24 +63,24 @@ discard block |
||
63 | 63 | * exception by the LDAP wrapper. We catch this. Other cases may |
64 | 64 | * pass (like e.g. expected syntax error). |
65 | 65 | */ |
66 | - try { |
|
67 | - $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn')); |
|
68 | - } catch (\Exception $e) { |
|
69 | - if($e->getCode() === 1) { |
|
70 | - OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.'))); |
|
71 | - exit; |
|
72 | - } |
|
73 | - } |
|
74 | - OCP\JSON::success(array('message' |
|
75 | - => $l->t('The configuration is valid and the connection could be established!'))); |
|
76 | - } else { |
|
77 | - OCP\JSON::error(array('message' |
|
78 | - => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.'))); |
|
79 | - } |
|
80 | - } else { |
|
81 | - OCP\JSON::error(array('message' |
|
82 | - => $l->t('The configuration is invalid. Please have a look at the logs for further details.'))); |
|
83 | - } |
|
66 | + try { |
|
67 | + $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn')); |
|
68 | + } catch (\Exception $e) { |
|
69 | + if($e->getCode() === 1) { |
|
70 | + OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.'))); |
|
71 | + exit; |
|
72 | + } |
|
73 | + } |
|
74 | + OCP\JSON::success(array('message' |
|
75 | + => $l->t('The configuration is valid and the connection could be established!'))); |
|
76 | + } else { |
|
77 | + OCP\JSON::error(array('message' |
|
78 | + => $l->t('The configuration is valid, but the Bind failed. Please check the server settings and credentials.'))); |
|
79 | + } |
|
80 | + } else { |
|
81 | + OCP\JSON::error(array('message' |
|
82 | + => $l->t('The configuration is invalid. Please have a look at the logs for further details.'))); |
|
83 | + } |
|
84 | 84 | } catch (\Exception $e) { |
85 | - OCP\JSON::error(array('message' => $e->getMessage())); |
|
85 | + OCP\JSON::error(array('message' => $e->getMessage())); |
|
86 | 86 | } |
@@ -66,7 +66,7 @@ |
||
66 | 66 | try { |
67 | 67 | $ldapWrapper->read($connection->getConnectionResource(), '', 'objectClass=*', array('dn')); |
68 | 68 | } catch (\Exception $e) { |
69 | - if($e->getCode() === 1) { |
|
69 | + if ($e->getCode() === 1) { |
|
70 | 70 | OCP\JSON::error(array('message' => $l->t('The configuration is invalid: anonymous bind is not allowed.'))); |
71 | 71 | exit; |
72 | 72 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
35 | 35 | $configuration = $connection->getConfiguration(); |
36 | 36 | if (isset($configuration['ldap_agent_password']) && $configuration['ldap_agent_password'] !== '') { |
37 | - // hide password |
|
38 | - $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
37 | + // hide password |
|
38 | + $configuration['ldap_agent_password'] = '**PASSWORD SET**'; |
|
39 | 39 | } |
40 | 40 | OCP\JSON::success(array('configuration' => $configuration)); |
@@ -29,7 +29,7 @@ |
||
29 | 29 | OCP\JSON::checkAppEnabled('user_ldap'); |
30 | 30 | OCP\JSON::callCheck(); |
31 | 31 | |
32 | -$prefix = (string)$_POST['ldap_serverconfig_chooser']; |
|
32 | +$prefix = (string) $_POST['ldap_serverconfig_chooser']; |
|
33 | 33 | $ldapWrapper = new OCA\User_LDAP\LDAP(); |
34 | 34 | $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
35 | 35 | $configuration = $connection->getConfiguration(); |
@@ -36,11 +36,11 @@ |
||
36 | 36 | // only legacy checkboxes (Advanced and Expert tab) need to be handled here, |
37 | 37 | // the Wizard-like tabs handle it on their own |
38 | 38 | $chkboxes = array('ldap_configuration_active', 'ldap_override_main_server', |
39 | - 'ldap_turn_off_cert_check'); |
|
39 | + 'ldap_turn_off_cert_check'); |
|
40 | 40 | foreach($chkboxes as $boxid) { |
41 | - if(!isset($_POST[$boxid])) { |
|
42 | - $_POST[$boxid] = 0; |
|
43 | - } |
|
41 | + if(!isset($_POST[$boxid])) { |
|
42 | + $_POST[$boxid] = 0; |
|
43 | + } |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | $ldapWrapper = new OCA\User_LDAP\LDAP(); |
@@ -30,15 +30,15 @@ |
||
30 | 30 | OCP\JSON::checkAppEnabled('user_ldap'); |
31 | 31 | OCP\JSON::callCheck(); |
32 | 32 | |
33 | -$prefix = (string)$_POST['ldap_serverconfig_chooser']; |
|
33 | +$prefix = (string) $_POST['ldap_serverconfig_chooser']; |
|
34 | 34 | |
35 | 35 | // Checkboxes are not submitted, when they are unchecked. Set them manually. |
36 | 36 | // only legacy checkboxes (Advanced and Expert tab) need to be handled here, |
37 | 37 | // the Wizard-like tabs handle it on their own |
38 | 38 | $chkboxes = array('ldap_configuration_active', 'ldap_override_main_server', |
39 | 39 | 'ldap_turn_off_cert_check'); |
40 | -foreach($chkboxes as $boxid) { |
|
41 | - if(!isset($_POST[$boxid])) { |
|
40 | +foreach ($chkboxes as $boxid) { |
|
41 | + if (!isset($_POST[$boxid])) { |
|
42 | 42 | $_POST[$boxid] = 0; |
43 | 43 | } |
44 | 44 | } |
@@ -34,8 +34,8 @@ |
||
34 | 34 | $prefix = (string)$_POST['ldap_serverconfig_chooser']; |
35 | 35 | $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); |
36 | 36 | if($helper->deleteServerConfiguration($prefix)) { |
37 | - OCP\JSON::success(); |
|
37 | + OCP\JSON::success(); |
|
38 | 38 | } else { |
39 | - $l = \OC::$server->getL10N('user_ldap'); |
|
40 | - OCP\JSON::error(array('message' => $l->t('Failed to delete the server configuration'))); |
|
39 | + $l = \OC::$server->getL10N('user_ldap'); |
|
40 | + OCP\JSON::error(array('message' => $l->t('Failed to delete the server configuration'))); |
|
41 | 41 | } |
@@ -31,9 +31,9 @@ |
||
31 | 31 | OCP\JSON::checkAppEnabled('user_ldap'); |
32 | 32 | OCP\JSON::callCheck(); |
33 | 33 | |
34 | -$prefix = (string)$_POST['ldap_serverconfig_chooser']; |
|
34 | +$prefix = (string) $_POST['ldap_serverconfig_chooser']; |
|
35 | 35 | $helper = new \OCA\User_LDAP\Helper(\OC::$server->getConfig()); |
36 | -if($helper->deleteServerConfiguration($prefix)) { |
|
36 | +if ($helper->deleteServerConfiguration($prefix)) { |
|
37 | 37 | OCP\JSON::success(); |
38 | 38 | } else { |
39 | 39 | $l = \OC::$server->getL10N('user_ldap'); |
@@ -32,16 +32,16 @@ discard block |
||
32 | 32 | |
33 | 33 | $l = \OC::$server->getL10N('user_ldap'); |
34 | 34 | |
35 | -if(!isset($_POST['action'])) { |
|
35 | +if (!isset($_POST['action'])) { |
|
36 | 36 | \OCP\JSON::error(array('message' => $l->t('No action specified'))); |
37 | 37 | } |
38 | -$action = (string)$_POST['action']; |
|
38 | +$action = (string) $_POST['action']; |
|
39 | 39 | |
40 | 40 | |
41 | -if(!isset($_POST['ldap_serverconfig_chooser'])) { |
|
41 | +if (!isset($_POST['ldap_serverconfig_chooser'])) { |
|
42 | 42 | \OCP\JSON::error(array('message' => $l->t('No configuration specified'))); |
43 | 43 | } |
44 | -$prefix = (string)$_POST['ldap_serverconfig_chooser']; |
|
44 | +$prefix = (string) $_POST['ldap_serverconfig_chooser']; |
|
45 | 45 | |
46 | 46 | $ldapWrapper = new \OCA\User_LDAP\LDAP(); |
47 | 47 | $configuration = new \OCA\User_LDAP\Configuration($prefix); |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | |
67 | 67 | $wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access); |
68 | 68 | |
69 | -switch($action) { |
|
69 | +switch ($action) { |
|
70 | 70 | case 'guessPortAndTLS': |
71 | 71 | case 'guessBaseDN': |
72 | 72 | case 'detectEmailAttribute': |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | case 'countInBaseDN': |
86 | 86 | try { |
87 | 87 | $result = $wizard->$action(); |
88 | - if($result !== false) { |
|
88 | + if ($result !== false) { |
|
89 | 89 | OCP\JSON::success($result->getResultArray()); |
90 | 90 | exit; |
91 | 91 | } |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | try { |
102 | 102 | $loginName = $_POST['ldap_test_loginname']; |
103 | 103 | $result = $wizard->$action($loginName); |
104 | - if($result !== false) { |
|
104 | + if ($result !== false) { |
|
105 | 105 | OCP\JSON::success($result->getResultArray()); |
106 | 106 | exit; |
107 | 107 | } |
@@ -117,14 +117,14 @@ discard block |
||
117 | 117 | case 'save': |
118 | 118 | $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false; |
119 | 119 | $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null; |
120 | - if($key === false || is_null($val)) { |
|
120 | + if ($key === false || is_null($val)) { |
|
121 | 121 | \OCP\JSON::error(array('message' => $l->t('No data specified'))); |
122 | 122 | exit; |
123 | 123 | } |
124 | 124 | $cfg = array($key => $val); |
125 | 125 | $setParameters = array(); |
126 | 126 | $configuration->setConfiguration($cfg, $setParameters); |
127 | - if(!in_array($key, $setParameters)) { |
|
127 | + if (!in_array($key, $setParameters)) { |
|
128 | 128 | \OCP\JSON::error(array('message' => $l->t($key. |
129 | 129 | ' Could not set configuration %s', $setParameters[0]))); |
130 | 130 | exit; |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | $l = \OC::$server->getL10N('user_ldap'); |
34 | 34 | |
35 | 35 | if(!isset($_POST['action'])) { |
36 | - \OCP\JSON::error(array('message' => $l->t('No action specified'))); |
|
36 | + \OCP\JSON::error(array('message' => $l->t('No action specified'))); |
|
37 | 37 | } |
38 | 38 | $action = (string)$_POST['action']; |
39 | 39 | |
40 | 40 | |
41 | 41 | if(!isset($_POST['ldap_serverconfig_chooser'])) { |
42 | - \OCP\JSON::error(array('message' => $l->t('No configuration specified'))); |
|
42 | + \OCP\JSON::error(array('message' => $l->t('No configuration specified'))); |
|
43 | 43 | } |
44 | 44 | $prefix = (string)$_POST['ldap_serverconfig_chooser']; |
45 | 45 | |
@@ -52,91 +52,91 @@ discard block |
||
52 | 52 | $con->setIgnoreValidation(true); |
53 | 53 | |
54 | 54 | $userManager = new \OCA\User_LDAP\User\Manager( |
55 | - \OC::$server->getConfig(), |
|
56 | - new \OCA\User_LDAP\FilesystemHelper(), |
|
57 | - new \OCA\User_LDAP\LogWrapper(), |
|
58 | - \OC::$server->getAvatarManager(), |
|
59 | - new \OCP\Image(), |
|
60 | - \OC::$server->getDatabaseConnection(), |
|
61 | - \OC::$server->getUserManager(), |
|
62 | - \OC::$server->getNotificationManager()); |
|
55 | + \OC::$server->getConfig(), |
|
56 | + new \OCA\User_LDAP\FilesystemHelper(), |
|
57 | + new \OCA\User_LDAP\LogWrapper(), |
|
58 | + \OC::$server->getAvatarManager(), |
|
59 | + new \OCP\Image(), |
|
60 | + \OC::$server->getDatabaseConnection(), |
|
61 | + \OC::$server->getUserManager(), |
|
62 | + \OC::$server->getNotificationManager()); |
|
63 | 63 | |
64 | 64 | $access = new \OCA\User_LDAP\Access($con, $ldapWrapper, $userManager, new \OCA\User_LDAP\Helper( |
65 | - \OC::$server->getConfig() |
|
65 | + \OC::$server->getConfig() |
|
66 | 66 | )); |
67 | 67 | |
68 | 68 | $wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access); |
69 | 69 | |
70 | 70 | switch($action) { |
71 | - case 'guessPortAndTLS': |
|
72 | - case 'guessBaseDN': |
|
73 | - case 'detectEmailAttribute': |
|
74 | - case 'detectUserDisplayNameAttribute': |
|
75 | - case 'determineGroupMemberAssoc': |
|
76 | - case 'determineUserObjectClasses': |
|
77 | - case 'determineGroupObjectClasses': |
|
78 | - case 'determineGroupsForUsers': |
|
79 | - case 'determineGroupsForGroups': |
|
80 | - case 'determineAttributes': |
|
81 | - case 'getUserListFilter': |
|
82 | - case 'getUserLoginFilter': |
|
83 | - case 'getGroupFilter': |
|
84 | - case 'countUsers': |
|
85 | - case 'countGroups': |
|
86 | - case 'countInBaseDN': |
|
87 | - try { |
|
88 | - $result = $wizard->$action(); |
|
89 | - if($result !== false) { |
|
90 | - OCP\JSON::success($result->getResultArray()); |
|
91 | - exit; |
|
92 | - } |
|
93 | - } catch (\Exception $e) { |
|
94 | - \OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode())); |
|
95 | - exit; |
|
96 | - } |
|
97 | - \OCP\JSON::error(); |
|
98 | - exit; |
|
99 | - break; |
|
71 | + case 'guessPortAndTLS': |
|
72 | + case 'guessBaseDN': |
|
73 | + case 'detectEmailAttribute': |
|
74 | + case 'detectUserDisplayNameAttribute': |
|
75 | + case 'determineGroupMemberAssoc': |
|
76 | + case 'determineUserObjectClasses': |
|
77 | + case 'determineGroupObjectClasses': |
|
78 | + case 'determineGroupsForUsers': |
|
79 | + case 'determineGroupsForGroups': |
|
80 | + case 'determineAttributes': |
|
81 | + case 'getUserListFilter': |
|
82 | + case 'getUserLoginFilter': |
|
83 | + case 'getGroupFilter': |
|
84 | + case 'countUsers': |
|
85 | + case 'countGroups': |
|
86 | + case 'countInBaseDN': |
|
87 | + try { |
|
88 | + $result = $wizard->$action(); |
|
89 | + if($result !== false) { |
|
90 | + OCP\JSON::success($result->getResultArray()); |
|
91 | + exit; |
|
92 | + } |
|
93 | + } catch (\Exception $e) { |
|
94 | + \OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode())); |
|
95 | + exit; |
|
96 | + } |
|
97 | + \OCP\JSON::error(); |
|
98 | + exit; |
|
99 | + break; |
|
100 | 100 | |
101 | - case 'testLoginName': { |
|
102 | - try { |
|
103 | - $loginName = $_POST['ldap_test_loginname']; |
|
104 | - $result = $wizard->$action($loginName); |
|
105 | - if($result !== false) { |
|
106 | - OCP\JSON::success($result->getResultArray()); |
|
107 | - exit; |
|
108 | - } |
|
109 | - } catch (\Exception $e) { |
|
110 | - \OCP\JSON::error(array('message' => $e->getMessage())); |
|
111 | - exit; |
|
112 | - } |
|
113 | - \OCP\JSON::error(); |
|
114 | - exit; |
|
115 | - break; |
|
116 | - } |
|
101 | + case 'testLoginName': { |
|
102 | + try { |
|
103 | + $loginName = $_POST['ldap_test_loginname']; |
|
104 | + $result = $wizard->$action($loginName); |
|
105 | + if($result !== false) { |
|
106 | + OCP\JSON::success($result->getResultArray()); |
|
107 | + exit; |
|
108 | + } |
|
109 | + } catch (\Exception $e) { |
|
110 | + \OCP\JSON::error(array('message' => $e->getMessage())); |
|
111 | + exit; |
|
112 | + } |
|
113 | + \OCP\JSON::error(); |
|
114 | + exit; |
|
115 | + break; |
|
116 | + } |
|
117 | 117 | |
118 | - case 'save': |
|
119 | - $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false; |
|
120 | - $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null; |
|
121 | - if($key === false || is_null($val)) { |
|
122 | - \OCP\JSON::error(array('message' => $l->t('No data specified'))); |
|
123 | - exit; |
|
124 | - } |
|
125 | - $cfg = array($key => $val); |
|
126 | - $setParameters = array(); |
|
127 | - $configuration->setConfiguration($cfg, $setParameters); |
|
128 | - if(!in_array($key, $setParameters)) { |
|
129 | - \OCP\JSON::error(array('message' => $l->t($key. |
|
130 | - ' Could not set configuration %s', $setParameters[0]))); |
|
131 | - exit; |
|
132 | - } |
|
133 | - $configuration->saveConfiguration(); |
|
134 | - //clear the cache on save |
|
135 | - $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
|
136 | - $connection->clearCache(); |
|
137 | - OCP\JSON::success(); |
|
138 | - break; |
|
139 | - default: |
|
140 | - \OCP\JSON::error(array('message' => $l->t('Action does not exist'))); |
|
141 | - break; |
|
118 | + case 'save': |
|
119 | + $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false; |
|
120 | + $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null; |
|
121 | + if($key === false || is_null($val)) { |
|
122 | + \OCP\JSON::error(array('message' => $l->t('No data specified'))); |
|
123 | + exit; |
|
124 | + } |
|
125 | + $cfg = array($key => $val); |
|
126 | + $setParameters = array(); |
|
127 | + $configuration->setConfiguration($cfg, $setParameters); |
|
128 | + if(!in_array($key, $setParameters)) { |
|
129 | + \OCP\JSON::error(array('message' => $l->t($key. |
|
130 | + ' Could not set configuration %s', $setParameters[0]))); |
|
131 | + exit; |
|
132 | + } |
|
133 | + $configuration->saveConfiguration(); |
|
134 | + //clear the cache on save |
|
135 | + $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
|
136 | + $connection->clearCache(); |
|
137 | + OCP\JSON::success(); |
|
138 | + break; |
|
139 | + default: |
|
140 | + \OCP\JSON::error(array('message' => $l->t('Action does not exist'))); |
|
141 | + break; |
|
142 | 142 | } |
@@ -38,12 +38,12 @@ |
||
38 | 38 | |
39 | 39 | $newConfig = new \OCA\User_LDAP\Configuration($nk, false); |
40 | 40 | if(isset($_POST['copyConfig'])) { |
41 | - $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
|
42 | - $newConfig->setConfiguration($originalConfig->getConfiguration()); |
|
41 | + $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
|
42 | + $newConfig->setConfiguration($originalConfig->getConfiguration()); |
|
43 | 43 | } else { |
44 | - $configuration = new \OCA\User_LDAP\Configuration($nk, false); |
|
45 | - $newConfig->setConfiguration($configuration->getDefaults()); |
|
46 | - $resultData['defaults'] = $configuration->getDefaults(); |
|
44 | + $configuration = new \OCA\User_LDAP\Configuration($nk, false); |
|
45 | + $newConfig->setConfiguration($configuration->getDefaults()); |
|
46 | + $resultData['defaults'] = $configuration->getDefaults(); |
|
47 | 47 | } |
48 | 48 | $newConfig->saveConfiguration(); |
49 | 49 |
@@ -32,12 +32,12 @@ |
||
32 | 32 | sort($serverConnections); |
33 | 33 | $lk = array_pop($serverConnections); |
34 | 34 | $ln = intval(str_replace('s', '', $lk)); |
35 | -$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT); |
|
35 | +$nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT); |
|
36 | 36 | |
37 | 37 | $resultData = array('configPrefix' => $nk); |
38 | 38 | |
39 | 39 | $newConfig = new \OCA\User_LDAP\Configuration($nk, false); |
40 | -if(isset($_POST['copyConfig'])) { |
|
40 | +if (isset($_POST['copyConfig'])) { |
|
41 | 41 | $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
42 | 42 | $newConfig->setConfiguration($originalConfig->getConfiguration()); |
43 | 43 | } else { |