@@ -29,60 +29,60 @@ |
||
29 | 29 | |
30 | 30 | $application = new Application(); |
31 | 31 | $application->registerRoutes( |
32 | - $this, |
|
33 | - array( |
|
34 | - 'routes' => array( |
|
35 | - array( |
|
36 | - 'name' => 'API#getThumbnail', |
|
37 | - 'url' => '/api/v1/thumbnail/{x}/{y}/{file}', |
|
38 | - 'verb' => 'GET', |
|
39 | - 'requirements' => array('file' => '.+') |
|
40 | - ), |
|
41 | - array( |
|
42 | - 'name' => 'API#updateFileTags', |
|
43 | - 'url' => '/api/v1/files/{path}', |
|
44 | - 'verb' => 'POST', |
|
45 | - 'requirements' => array('path' => '.+'), |
|
46 | - ), |
|
47 | - array( |
|
48 | - 'name' => 'API#getRecentFiles', |
|
49 | - 'url' => '/api/v1/recent/', |
|
50 | - 'verb' => 'GET' |
|
51 | - ), |
|
52 | - array( |
|
53 | - 'name' => 'API#updateFileSorting', |
|
54 | - 'url' => '/api/v1/sorting', |
|
55 | - 'verb' => 'POST' |
|
56 | - ), |
|
57 | - array( |
|
58 | - 'name' => 'API#showHiddenFiles', |
|
59 | - 'url' => '/api/v1/showhidden', |
|
60 | - 'verb' => 'POST' |
|
61 | - ), |
|
62 | - [ |
|
63 | - 'name' => 'view#index', |
|
64 | - 'url' => '/', |
|
65 | - 'verb' => 'GET', |
|
66 | - ], |
|
67 | - [ |
|
68 | - 'name' => 'settings#setMaxUploadSize', |
|
69 | - 'url' => '/settings/maxUpload', |
|
70 | - 'verb' => 'POST', |
|
71 | - ] |
|
72 | - ) |
|
73 | - ) |
|
32 | + $this, |
|
33 | + array( |
|
34 | + 'routes' => array( |
|
35 | + array( |
|
36 | + 'name' => 'API#getThumbnail', |
|
37 | + 'url' => '/api/v1/thumbnail/{x}/{y}/{file}', |
|
38 | + 'verb' => 'GET', |
|
39 | + 'requirements' => array('file' => '.+') |
|
40 | + ), |
|
41 | + array( |
|
42 | + 'name' => 'API#updateFileTags', |
|
43 | + 'url' => '/api/v1/files/{path}', |
|
44 | + 'verb' => 'POST', |
|
45 | + 'requirements' => array('path' => '.+'), |
|
46 | + ), |
|
47 | + array( |
|
48 | + 'name' => 'API#getRecentFiles', |
|
49 | + 'url' => '/api/v1/recent/', |
|
50 | + 'verb' => 'GET' |
|
51 | + ), |
|
52 | + array( |
|
53 | + 'name' => 'API#updateFileSorting', |
|
54 | + 'url' => '/api/v1/sorting', |
|
55 | + 'verb' => 'POST' |
|
56 | + ), |
|
57 | + array( |
|
58 | + 'name' => 'API#showHiddenFiles', |
|
59 | + 'url' => '/api/v1/showhidden', |
|
60 | + 'verb' => 'POST' |
|
61 | + ), |
|
62 | + [ |
|
63 | + 'name' => 'view#index', |
|
64 | + 'url' => '/', |
|
65 | + 'verb' => 'GET', |
|
66 | + ], |
|
67 | + [ |
|
68 | + 'name' => 'settings#setMaxUploadSize', |
|
69 | + 'url' => '/settings/maxUpload', |
|
70 | + 'verb' => 'POST', |
|
71 | + ] |
|
72 | + ) |
|
73 | + ) |
|
74 | 74 | ); |
75 | 75 | |
76 | 76 | /** @var $this \OC\Route\Router */ |
77 | 77 | |
78 | 78 | $this->create('files_ajax_download', 'ajax/download.php') |
79 | - ->actionInclude('files/ajax/download.php'); |
|
79 | + ->actionInclude('files/ajax/download.php'); |
|
80 | 80 | $this->create('files_ajax_getstoragestats', 'ajax/getstoragestats.php') |
81 | - ->actionInclude('files/ajax/getstoragestats.php'); |
|
81 | + ->actionInclude('files/ajax/getstoragestats.php'); |
|
82 | 82 | $this->create('files_ajax_list', 'ajax/list.php') |
83 | - ->actionInclude('files/ajax/list.php'); |
|
83 | + ->actionInclude('files/ajax/list.php'); |
|
84 | 84 | |
85 | 85 | $this->create('download', 'download{file}') |
86 | - ->requirements(array('file' => '.*')) |
|
87 | - ->actionInclude('files/download.php'); |
|
86 | + ->requirements(array('file' => '.*')) |
|
87 | + ->actionInclude('files/download.php'); |
|
88 | 88 |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | $templateManager->registerTemplate('application/vnd.oasis.opendocument.text', 'core/templates/filetemplates/template.odt'); |
39 | 39 | $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods'); |
40 | 40 | |
41 | -\OCA\Files\App::getNavigationManager()->add(function () use ($l) { |
|
41 | +\OCA\Files\App::getNavigationManager()->add(function() use ($l) { |
|
42 | 42 | return [ |
43 | 43 | 'id' => 'files', |
44 | 44 | 'appname' => 'files', |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | ]; |
49 | 49 | }); |
50 | 50 | |
51 | -\OCA\Files\App::getNavigationManager()->add(function () use ($l) { |
|
51 | +\OCA\Files\App::getNavigationManager()->add(function() use ($l) { |
|
52 | 52 | return [ |
53 | 53 | 'id' => 'recent', |
54 | 54 | 'appname' => 'files', |
@@ -39,23 +39,23 @@ |
||
39 | 39 | $templateManager->registerTemplate('application/vnd.oasis.opendocument.spreadsheet', 'core/templates/filetemplates/template.ods'); |
40 | 40 | |
41 | 41 | \OCA\Files\App::getNavigationManager()->add(function () use ($l) { |
42 | - return [ |
|
43 | - 'id' => 'files', |
|
44 | - 'appname' => 'files', |
|
45 | - 'script' => 'list.php', |
|
46 | - 'order' => 0, |
|
47 | - 'name' => $l->t('All files'), |
|
48 | - ]; |
|
42 | + return [ |
|
43 | + 'id' => 'files', |
|
44 | + 'appname' => 'files', |
|
45 | + 'script' => 'list.php', |
|
46 | + 'order' => 0, |
|
47 | + 'name' => $l->t('All files'), |
|
48 | + ]; |
|
49 | 49 | }); |
50 | 50 | |
51 | 51 | \OCA\Files\App::getNavigationManager()->add(function () use ($l) { |
52 | - return [ |
|
53 | - 'id' => 'recent', |
|
54 | - 'appname' => 'files', |
|
55 | - 'script' => 'recentlist.php', |
|
56 | - 'order' => 2, |
|
57 | - 'name' => $l->t('Recent'), |
|
58 | - ]; |
|
52 | + return [ |
|
53 | + 'id' => 'recent', |
|
54 | + 'appname' => 'files', |
|
55 | + 'script' => 'recentlist.php', |
|
56 | + 'order' => 2, |
|
57 | + 'name' => $l->t('Recent'), |
|
58 | + ]; |
|
59 | 59 | }); |
60 | 60 | |
61 | 61 | \OCP\Util::connectHook('\OCP\Config', 'js', '\OCA\Files\App', 'extendJsConfig'); |
@@ -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" |
@@ -1,16 +1,16 @@ discard block |
||
1 | 1 | <fieldset id="ldapWizard1"> |
2 | 2 | <p> |
3 | 3 | <select id="ldap_serverconfig_chooser" name="ldap_serverconfig_chooser"> |
4 | - <?php if(count($_['serverConfigurationPrefixes']) === 0 ) { |
|
4 | + <?php if (count($_['serverConfigurationPrefixes']) === 0) { |
|
5 | 5 | ?> |
6 | - <option value="" selected><?php p($l->t('1. Server'));?></option>'); |
|
6 | + <option value="" selected><?php p($l->t('1. Server')); ?></option>'); |
|
7 | 7 | <?php |
8 | 8 | } else { |
9 | 9 | $i = 1; |
10 | 10 | $sel = ' selected'; |
11 | - foreach($_['serverConfigurationPrefixes'] as $prefix) { |
|
11 | + foreach ($_['serverConfigurationPrefixes'] as $prefix) { |
|
12 | 12 | ?> |
13 | - <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++)));?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> |
|
13 | + <option value="<?php p($prefix); ?>"<?php p($sel); $sel = ''; ?>><?php p($l->t('%s. Server:', array($i++))); ?> <?php p(' '.$_['serverConfigurationHosts'][$prefix]); ?></option> |
|
14 | 14 | <?php |
15 | 15 | } |
16 | 16 | } |
@@ -18,14 +18,14 @@ discard block |
||
18 | 18 | </select> |
19 | 19 | <button type="button" id="ldap_action_add_configuration" |
20 | 20 | name="ldap_action_add_configuration" class="icon-add icon-default-style" |
21 | - title="<?php p($l->t('Add a new configuration'));?>"> </button> |
|
21 | + title="<?php p($l->t('Add a new configuration')); ?>"> </button> |
|
22 | 22 | <button type="button" id="ldap_action_copy_configuration" |
23 | 23 | name="ldap_action_copy_configuration" |
24 | 24 | class="ldapIconCopy icon-default-style" |
25 | - title="<?php p($l->t('Copy current configuration into new directory binding'));?>"> </button> |
|
25 | + title="<?php p($l->t('Copy current configuration into new directory binding')); ?>"> </button> |
|
26 | 26 | <button type="button" id="ldap_action_delete_configuration" |
27 | 27 | name="ldap_action_delete_configuration" class="icon-delete icon-default-style" |
28 | - title="<?php p($l->t('Delete the current configuration'));?>"> </button> |
|
28 | + title="<?php p($l->t('Delete the current configuration')); ?>"> </button> |
|
29 | 29 | </p> |
30 | 30 | |
31 | 31 | <div class="hostPortCombinator"> |
@@ -34,14 +34,14 @@ discard block |
||
34 | 34 | <div class="table"> |
35 | 35 | <input type="text" class="host" id="ldap_host" |
36 | 36 | name="ldap_host" |
37 | - placeholder="<?php p($l->t('Host'));?>" |
|
38 | - title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>" |
|
37 | + placeholder="<?php p($l->t('Host')); ?>" |
|
38 | + title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://')); ?>" |
|
39 | 39 | /> |
40 | 40 | <span class="hostPortCombinatorSpan"> |
41 | 41 | <input type="number" id="ldap_port" name="ldap_port" |
42 | - placeholder="<?php p($l->t('Port'));?>" /> |
|
42 | + placeholder="<?php p($l->t('Port')); ?>" /> |
|
43 | 43 | <button class="ldapDetectPort" name="ldapDetectPort" type="button"> |
44 | - <?php p($l->t('Detect Port'));?> |
|
44 | + <?php p($l->t('Detect Port')); ?> |
|
45 | 45 | </button> |
46 | 46 | </span> |
47 | 47 | </div> |
@@ -51,19 +51,19 @@ discard block |
||
51 | 51 | <div class="tablerow"> |
52 | 52 | <input type="text" id="ldap_dn" name="ldap_dn" |
53 | 53 | class="tablecell" |
54 | - placeholder="<?php p($l->t('User DN'));?>" autocomplete="off" |
|
55 | - 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.'));?>" |
|
54 | + placeholder="<?php p($l->t('User DN')); ?>" autocomplete="off" |
|
55 | + 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.')); ?>" |
|
56 | 56 | /> |
57 | 57 | </div> |
58 | 58 | |
59 | 59 | <div class="tablerow"> |
60 | 60 | <input type="password" id="ldap_agent_password" |
61 | 61 | class="tablecell" name="ldap_agent_password" |
62 | - placeholder="<?php p($l->t('Password'));?>" autocomplete="off" |
|
63 | - title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>" |
|
62 | + placeholder="<?php p($l->t('Password')); ?>" autocomplete="off" |
|
63 | + title="<?php p($l->t('For anonymous access, leave DN and Password empty.')); ?>" |
|
64 | 64 | /> |
65 | 65 | <button class="ldapSaveAgentCredentials" name="ldapSaveAgentCredentials" type="button"> |
66 | - <?php p($l->t('Save Credentials'));?> |
|
66 | + <?php p($l->t('Save Credentials')); ?> |
|
67 | 67 | </button> |
68 | 68 | </div> |
69 | 69 | <div class="tablerow"> </div> |
@@ -71,24 +71,24 @@ discard block |
||
71 | 71 | <div class="tablerow"> |
72 | 72 | <textarea id="ldap_base" name="ldap_base" |
73 | 73 | class="tablecell" |
74 | - placeholder="<?php p($l->t('One Base DN per line'));?>" |
|
75 | - title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>"> |
|
74 | + placeholder="<?php p($l->t('One Base DN per line')); ?>" |
|
75 | + title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab')); ?>"> |
|
76 | 76 | </textarea> |
77 | 77 | <button class="ldapDetectBase" name="ldapDetectBase" type="button"> |
78 | - <?php p($l->t('Detect Base DN'));?> |
|
78 | + <?php p($l->t('Detect Base DN')); ?> |
|
79 | 79 | </button> |
80 | 80 | <button class="ldapTestBase" name="ldapTestBase" type="button"> |
81 | - <?php p($l->t('Test Base DN'));?> |
|
81 | + <?php p($l->t('Test Base DN')); ?> |
|
82 | 82 | </button> |
83 | 83 | </div> |
84 | 84 | |
85 | 85 | <div class="tablerow left"> |
86 | 86 | <input type="checkbox" id="ldap_experienced_admin" value="1" |
87 | 87 | name="ldap_experienced_admin" class="tablecell" |
88 | - title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>" |
|
88 | + title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>" |
|
89 | 89 | /> |
90 | 90 | <label for="ldap_experienced_admin" class="tablecell"> |
91 | - <?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?> |
|
91 | + <?php p($l->t('Manually enter LDAP filters (recommended for large directories)')); ?> |
|
92 | 92 | </label> |
93 | 93 | </div> |
94 | 94 |
@@ -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 | } |
@@ -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; |
@@ -36,13 +36,13 @@ discard block |
||
36 | 36 | $l = \OC::$server->getL10N('user_ldap'); |
37 | 37 | |
38 | 38 | if(!isset($_POST['action'])) { |
39 | - \OCP\JSON::error(array('message' => $l->t('No action specified'))); |
|
39 | + \OCP\JSON::error(array('message' => $l->t('No action specified'))); |
|
40 | 40 | } |
41 | 41 | $action = (string)$_POST['action']; |
42 | 42 | |
43 | 43 | |
44 | 44 | if(!isset($_POST['ldap_serverconfig_chooser'])) { |
45 | - \OCP\JSON::error(array('message' => $l->t('No configuration specified'))); |
|
45 | + \OCP\JSON::error(array('message' => $l->t('No configuration specified'))); |
|
46 | 46 | } |
47 | 47 | $prefix = (string)$_POST['ldap_serverconfig_chooser']; |
48 | 48 | |
@@ -55,95 +55,95 @@ discard block |
||
55 | 55 | $con->setIgnoreValidation(true); |
56 | 56 | |
57 | 57 | $userManager = new \OCA\User_LDAP\User\Manager( |
58 | - \OC::$server->getConfig(), |
|
59 | - new \OCA\User_LDAP\FilesystemHelper(), |
|
60 | - new \OCA\User_LDAP\LogWrapper(), |
|
61 | - \OC::$server->getAvatarManager(), |
|
62 | - new \OCP\Image(), |
|
63 | - \OC::$server->getDatabaseConnection(), |
|
64 | - \OC::$server->getUserManager(), |
|
65 | - \OC::$server->getNotificationManager()); |
|
58 | + \OC::$server->getConfig(), |
|
59 | + new \OCA\User_LDAP\FilesystemHelper(), |
|
60 | + new \OCA\User_LDAP\LogWrapper(), |
|
61 | + \OC::$server->getAvatarManager(), |
|
62 | + new \OCP\Image(), |
|
63 | + \OC::$server->getDatabaseConnection(), |
|
64 | + \OC::$server->getUserManager(), |
|
65 | + \OC::$server->getNotificationManager()); |
|
66 | 66 | |
67 | 67 | $access = new \OCA\User_LDAP\Access( |
68 | - $con, |
|
69 | - $ldapWrapper, |
|
70 | - $userManager, |
|
71 | - new \OCA\User_LDAP\Helper(\OC::$server->getConfig()), |
|
72 | - \OC::$server->getConfig() |
|
68 | + $con, |
|
69 | + $ldapWrapper, |
|
70 | + $userManager, |
|
71 | + new \OCA\User_LDAP\Helper(\OC::$server->getConfig()), |
|
72 | + \OC::$server->getConfig() |
|
73 | 73 | ); |
74 | 74 | |
75 | 75 | $wizard = new \OCA\User_LDAP\Wizard($configuration, $ldapWrapper, $access); |
76 | 76 | |
77 | 77 | switch($action) { |
78 | - case 'guessPortAndTLS': |
|
79 | - case 'guessBaseDN': |
|
80 | - case 'detectEmailAttribute': |
|
81 | - case 'detectUserDisplayNameAttribute': |
|
82 | - case 'determineGroupMemberAssoc': |
|
83 | - case 'determineUserObjectClasses': |
|
84 | - case 'determineGroupObjectClasses': |
|
85 | - case 'determineGroupsForUsers': |
|
86 | - case 'determineGroupsForGroups': |
|
87 | - case 'determineAttributes': |
|
88 | - case 'getUserListFilter': |
|
89 | - case 'getUserLoginFilter': |
|
90 | - case 'getGroupFilter': |
|
91 | - case 'countUsers': |
|
92 | - case 'countGroups': |
|
93 | - case 'countInBaseDN': |
|
94 | - try { |
|
95 | - $result = $wizard->$action(); |
|
96 | - if($result !== false) { |
|
97 | - OCP\JSON::success($result->getResultArray()); |
|
98 | - exit; |
|
99 | - } |
|
100 | - } catch (\Exception $e) { |
|
101 | - \OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode())); |
|
102 | - exit; |
|
103 | - } |
|
104 | - \OCP\JSON::error(); |
|
105 | - exit; |
|
106 | - break; |
|
78 | + case 'guessPortAndTLS': |
|
79 | + case 'guessBaseDN': |
|
80 | + case 'detectEmailAttribute': |
|
81 | + case 'detectUserDisplayNameAttribute': |
|
82 | + case 'determineGroupMemberAssoc': |
|
83 | + case 'determineUserObjectClasses': |
|
84 | + case 'determineGroupObjectClasses': |
|
85 | + case 'determineGroupsForUsers': |
|
86 | + case 'determineGroupsForGroups': |
|
87 | + case 'determineAttributes': |
|
88 | + case 'getUserListFilter': |
|
89 | + case 'getUserLoginFilter': |
|
90 | + case 'getGroupFilter': |
|
91 | + case 'countUsers': |
|
92 | + case 'countGroups': |
|
93 | + case 'countInBaseDN': |
|
94 | + try { |
|
95 | + $result = $wizard->$action(); |
|
96 | + if($result !== false) { |
|
97 | + OCP\JSON::success($result->getResultArray()); |
|
98 | + exit; |
|
99 | + } |
|
100 | + } catch (\Exception $e) { |
|
101 | + \OCP\JSON::error(array('message' => $e->getMessage(), 'code' => $e->getCode())); |
|
102 | + exit; |
|
103 | + } |
|
104 | + \OCP\JSON::error(); |
|
105 | + exit; |
|
106 | + break; |
|
107 | 107 | |
108 | - case 'testLoginName': { |
|
109 | - try { |
|
110 | - $loginName = $_POST['ldap_test_loginname']; |
|
111 | - $result = $wizard->$action($loginName); |
|
112 | - if($result !== false) { |
|
113 | - OCP\JSON::success($result->getResultArray()); |
|
114 | - exit; |
|
115 | - } |
|
116 | - } catch (\Exception $e) { |
|
117 | - \OCP\JSON::error(array('message' => $e->getMessage())); |
|
118 | - exit; |
|
119 | - } |
|
120 | - \OCP\JSON::error(); |
|
121 | - exit; |
|
122 | - break; |
|
123 | - } |
|
108 | + case 'testLoginName': { |
|
109 | + try { |
|
110 | + $loginName = $_POST['ldap_test_loginname']; |
|
111 | + $result = $wizard->$action($loginName); |
|
112 | + if($result !== false) { |
|
113 | + OCP\JSON::success($result->getResultArray()); |
|
114 | + exit; |
|
115 | + } |
|
116 | + } catch (\Exception $e) { |
|
117 | + \OCP\JSON::error(array('message' => $e->getMessage())); |
|
118 | + exit; |
|
119 | + } |
|
120 | + \OCP\JSON::error(); |
|
121 | + exit; |
|
122 | + break; |
|
123 | + } |
|
124 | 124 | |
125 | - case 'save': |
|
126 | - $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false; |
|
127 | - $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null; |
|
128 | - if($key === false || is_null($val)) { |
|
129 | - \OCP\JSON::error(array('message' => $l->t('No data specified'))); |
|
130 | - exit; |
|
131 | - } |
|
132 | - $cfg = array($key => $val); |
|
133 | - $setParameters = array(); |
|
134 | - $configuration->setConfiguration($cfg, $setParameters); |
|
135 | - if(!in_array($key, $setParameters)) { |
|
136 | - \OCP\JSON::error(array('message' => $l->t($key. |
|
137 | - ' Could not set configuration %s', $setParameters[0]))); |
|
138 | - exit; |
|
139 | - } |
|
140 | - $configuration->saveConfiguration(); |
|
141 | - //clear the cache on save |
|
142 | - $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
|
143 | - $connection->clearCache(); |
|
144 | - OCP\JSON::success(); |
|
145 | - break; |
|
146 | - default: |
|
147 | - \OCP\JSON::error(array('message' => $l->t('Action does not exist'))); |
|
148 | - break; |
|
125 | + case 'save': |
|
126 | + $key = isset($_POST['cfgkey']) ? $_POST['cfgkey'] : false; |
|
127 | + $val = isset($_POST['cfgval']) ? $_POST['cfgval'] : null; |
|
128 | + if($key === false || is_null($val)) { |
|
129 | + \OCP\JSON::error(array('message' => $l->t('No data specified'))); |
|
130 | + exit; |
|
131 | + } |
|
132 | + $cfg = array($key => $val); |
|
133 | + $setParameters = array(); |
|
134 | + $configuration->setConfiguration($cfg, $setParameters); |
|
135 | + if(!in_array($key, $setParameters)) { |
|
136 | + \OCP\JSON::error(array('message' => $l->t($key. |
|
137 | + ' Could not set configuration %s', $setParameters[0]))); |
|
138 | + exit; |
|
139 | + } |
|
140 | + $configuration->saveConfiguration(); |
|
141 | + //clear the cache on save |
|
142 | + $connection = new \OCA\User_LDAP\Connection($ldapWrapper, $prefix); |
|
143 | + $connection->clearCache(); |
|
144 | + OCP\JSON::success(); |
|
145 | + break; |
|
146 | + default: |
|
147 | + \OCP\JSON::error(array('message' => $l->t('Action does not exist'))); |
|
148 | + break; |
|
149 | 149 | } |