@@ -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 | |
@@ -39,21 +39,21 @@ |
||
| 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 | }); |
@@ -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" |
@@ -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 | } |
@@ -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)); |
@@ -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(); |
@@ -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 | } |
@@ -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 | |
@@ -29,12 +29,12 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | class GroupMapping extends AbstractMapping { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * returns the DB table name which holds the mappings |
|
| 34 | - * @return string |
|
| 35 | - */ |
|
| 36 | - protected function getTableName() { |
|
| 37 | - return '*PREFIX*ldap_group_mapping'; |
|
| 38 | - } |
|
| 32 | + /** |
|
| 33 | + * returns the DB table name which holds the mappings |
|
| 34 | + * @return string |
|
| 35 | + */ |
|
| 36 | + protected function getTableName() { |
|
| 37 | + return '*PREFIX*ldap_group_mapping'; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | 40 | } |