@@ -49,8 +49,8 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function getSupportedActions() { |
| 51 | 51 | $actions = 0; |
| 52 | - foreach($this->possibleActions AS $action => $methodName) { |
|
| 53 | - if(method_exists($this, $methodName)) { |
|
| 52 | + foreach ($this->possibleActions AS $action => $methodName) { |
|
| 53 | + if (method_exists($this, $methodName)) { |
|
| 54 | 54 | $actions |= $action; |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * compared with \OC\Group\Backend::CREATE_GROUP etc. |
| 68 | 68 | */ |
| 69 | 69 | public function implementsActions($actions) { |
| 70 | - return (bool)($this->getSupportedActions() & $actions); |
|
| 70 | + return (bool) ($this->getSupportedActions() & $actions); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |
@@ -26,107 +26,107 @@ |
||
| 26 | 26 | * Abstract base class for user management |
| 27 | 27 | */ |
| 28 | 28 | abstract class Backend implements \OCP\GroupInterface { |
| 29 | - /** |
|
| 30 | - * error code for functions not provided by the group backend |
|
| 31 | - */ |
|
| 32 | - const NOT_IMPLEMENTED = -501; |
|
| 29 | + /** |
|
| 30 | + * error code for functions not provided by the group backend |
|
| 31 | + */ |
|
| 32 | + const NOT_IMPLEMENTED = -501; |
|
| 33 | 33 | |
| 34 | - protected $possibleActions = [ |
|
| 35 | - self::CREATE_GROUP => 'createGroup', |
|
| 36 | - self::DELETE_GROUP => 'deleteGroup', |
|
| 37 | - self::ADD_TO_GROUP => 'addToGroup', |
|
| 38 | - self::REMOVE_FROM_GOUP => 'removeFromGroup', |
|
| 39 | - self::COUNT_USERS => 'countUsersInGroup', |
|
| 40 | - self::GROUP_DETAILS => 'getGroupDetails', |
|
| 41 | - self::IS_ADMIN => 'isAdmin', |
|
| 42 | - ]; |
|
| 34 | + protected $possibleActions = [ |
|
| 35 | + self::CREATE_GROUP => 'createGroup', |
|
| 36 | + self::DELETE_GROUP => 'deleteGroup', |
|
| 37 | + self::ADD_TO_GROUP => 'addToGroup', |
|
| 38 | + self::REMOVE_FROM_GOUP => 'removeFromGroup', |
|
| 39 | + self::COUNT_USERS => 'countUsersInGroup', |
|
| 40 | + self::GROUP_DETAILS => 'getGroupDetails', |
|
| 41 | + self::IS_ADMIN => 'isAdmin', |
|
| 42 | + ]; |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * Get all supported actions |
|
| 46 | - * @return int bitwise-or'ed actions |
|
| 47 | - * |
|
| 48 | - * Returns the supported actions as int to be |
|
| 49 | - * compared with \OC\Group\Backend::CREATE_GROUP etc. |
|
| 50 | - */ |
|
| 51 | - public function getSupportedActions() { |
|
| 52 | - $actions = 0; |
|
| 53 | - foreach($this->possibleActions AS $action => $methodName) { |
|
| 54 | - if(method_exists($this, $methodName)) { |
|
| 55 | - $actions |= $action; |
|
| 56 | - } |
|
| 57 | - } |
|
| 44 | + /** |
|
| 45 | + * Get all supported actions |
|
| 46 | + * @return int bitwise-or'ed actions |
|
| 47 | + * |
|
| 48 | + * Returns the supported actions as int to be |
|
| 49 | + * compared with \OC\Group\Backend::CREATE_GROUP etc. |
|
| 50 | + */ |
|
| 51 | + public function getSupportedActions() { |
|
| 52 | + $actions = 0; |
|
| 53 | + foreach($this->possibleActions AS $action => $methodName) { |
|
| 54 | + if(method_exists($this, $methodName)) { |
|
| 55 | + $actions |= $action; |
|
| 56 | + } |
|
| 57 | + } |
|
| 58 | 58 | |
| 59 | - return $actions; |
|
| 60 | - } |
|
| 59 | + return $actions; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Check if backend implements actions |
|
| 64 | - * @param int $actions bitwise-or'ed actions |
|
| 65 | - * @return bool |
|
| 66 | - * |
|
| 67 | - * Returns the supported actions as int to be |
|
| 68 | - * compared with \OC\Group\Backend::CREATE_GROUP etc. |
|
| 69 | - */ |
|
| 70 | - public function implementsActions($actions) { |
|
| 71 | - return (bool)($this->getSupportedActions() & $actions); |
|
| 72 | - } |
|
| 62 | + /** |
|
| 63 | + * Check if backend implements actions |
|
| 64 | + * @param int $actions bitwise-or'ed actions |
|
| 65 | + * @return bool |
|
| 66 | + * |
|
| 67 | + * Returns the supported actions as int to be |
|
| 68 | + * compared with \OC\Group\Backend::CREATE_GROUP etc. |
|
| 69 | + */ |
|
| 70 | + public function implementsActions($actions) { |
|
| 71 | + return (bool)($this->getSupportedActions() & $actions); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * is user in group? |
|
| 76 | - * @param string $uid uid of the user |
|
| 77 | - * @param string $gid gid of the group |
|
| 78 | - * @return bool |
|
| 79 | - * |
|
| 80 | - * Checks whether the user is member of a group or not. |
|
| 81 | - */ |
|
| 82 | - public function inGroup($uid, $gid) { |
|
| 83 | - return in_array($gid, $this->getUserGroups($uid)); |
|
| 84 | - } |
|
| 74 | + /** |
|
| 75 | + * is user in group? |
|
| 76 | + * @param string $uid uid of the user |
|
| 77 | + * @param string $gid gid of the group |
|
| 78 | + * @return bool |
|
| 79 | + * |
|
| 80 | + * Checks whether the user is member of a group or not. |
|
| 81 | + */ |
|
| 82 | + public function inGroup($uid, $gid) { |
|
| 83 | + return in_array($gid, $this->getUserGroups($uid)); |
|
| 84 | + } |
|
| 85 | 85 | |
| 86 | - /** |
|
| 87 | - * Get all groups a user belongs to |
|
| 88 | - * @param string $uid Name of the user |
|
| 89 | - * @return array an array of group names |
|
| 90 | - * |
|
| 91 | - * This function fetches all groups a user belongs to. It does not check |
|
| 92 | - * if the user exists at all. |
|
| 93 | - */ |
|
| 94 | - public function getUserGroups($uid) { |
|
| 95 | - return array(); |
|
| 96 | - } |
|
| 86 | + /** |
|
| 87 | + * Get all groups a user belongs to |
|
| 88 | + * @param string $uid Name of the user |
|
| 89 | + * @return array an array of group names |
|
| 90 | + * |
|
| 91 | + * This function fetches all groups a user belongs to. It does not check |
|
| 92 | + * if the user exists at all. |
|
| 93 | + */ |
|
| 94 | + public function getUserGroups($uid) { |
|
| 95 | + return array(); |
|
| 96 | + } |
|
| 97 | 97 | |
| 98 | - /** |
|
| 99 | - * get a list of all groups |
|
| 100 | - * @param string $search |
|
| 101 | - * @param int $limit |
|
| 102 | - * @param int $offset |
|
| 103 | - * @return array an array of group names |
|
| 104 | - * |
|
| 105 | - * Returns a list with all groups |
|
| 106 | - */ |
|
| 98 | + /** |
|
| 99 | + * get a list of all groups |
|
| 100 | + * @param string $search |
|
| 101 | + * @param int $limit |
|
| 102 | + * @param int $offset |
|
| 103 | + * @return array an array of group names |
|
| 104 | + * |
|
| 105 | + * Returns a list with all groups |
|
| 106 | + */ |
|
| 107 | 107 | |
| 108 | - public function getGroups($search = '', $limit = -1, $offset = 0) { |
|
| 109 | - return array(); |
|
| 110 | - } |
|
| 108 | + public function getGroups($search = '', $limit = -1, $offset = 0) { |
|
| 109 | + return array(); |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - /** |
|
| 113 | - * check if a group exists |
|
| 114 | - * @param string $gid |
|
| 115 | - * @return bool |
|
| 116 | - */ |
|
| 117 | - public function groupExists($gid) { |
|
| 118 | - return in_array($gid, $this->getGroups($gid, 1)); |
|
| 119 | - } |
|
| 112 | + /** |
|
| 113 | + * check if a group exists |
|
| 114 | + * @param string $gid |
|
| 115 | + * @return bool |
|
| 116 | + */ |
|
| 117 | + public function groupExists($gid) { |
|
| 118 | + return in_array($gid, $this->getGroups($gid, 1)); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - /** |
|
| 122 | - * get a list of all users in a group |
|
| 123 | - * @param string $gid |
|
| 124 | - * @param string $search |
|
| 125 | - * @param int $limit |
|
| 126 | - * @param int $offset |
|
| 127 | - * @return array an array of user ids |
|
| 128 | - */ |
|
| 129 | - public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { |
|
| 130 | - return array(); |
|
| 131 | - } |
|
| 121 | + /** |
|
| 122 | + * get a list of all users in a group |
|
| 123 | + * @param string $gid |
|
| 124 | + * @param string $search |
|
| 125 | + * @param int $limit |
|
| 126 | + * @param int $offset |
|
| 127 | + * @return array an array of user ids |
|
| 128 | + */ |
|
| 129 | + public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) { |
|
| 130 | + return array(); |
|
| 131 | + } |
|
| 132 | 132 | } |
@@ -20,4 +20,4 @@ |
||
| 20 | 20 | * |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | -require_once __DIR__ . '/v1.php'; |
|
| 23 | +require_once __DIR__.'/v1.php'; |
|
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | $server = \OC::$server; |
| 27 | 27 | |
| 28 | 28 | $controller = new \OC\OCS\Provider( |
| 29 | - 'ocs_provider', |
|
| 30 | - $server->getRequest(), |
|
| 31 | - $server->getAppManager() |
|
| 29 | + 'ocs_provider', |
|
| 30 | + $server->getRequest(), |
|
| 31 | + $server->getAppManager() |
|
| 32 | 32 | ); |
| 33 | 33 | echo $controller->buildProviderList()->render(); |
@@ -19,7 +19,7 @@ |
||
| 19 | 19 | * |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | -require_once __DIR__ . '/../lib/base.php'; |
|
| 22 | +require_once __DIR__.'/../lib/base.php'; |
|
| 23 | 23 | |
| 24 | 24 | header('Content-Type: application/json'); |
| 25 | 25 | |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | <h2 class="title"><?php p($l->t('App update required')); ?></h2> |
| 5 | 5 | <?php } else { ?> |
| 6 | 6 | <h2 class="title"><?php p($l->t('%s will be updated to version %s', |
| 7 | - array($_['productName'], $_['version']))); ?></h2> |
|
| 7 | + array($_['productName'], $_['version']))); ?></h2> |
|
| 8 | 8 | <?php } ?> |
| 9 | 9 | <?php if (!empty($_['appsToUpgrade'])) { ?> |
| 10 | 10 | <div class="infogroup"> |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | <p id="update-progress-message-error" class="hidden"></p> |
| 50 | 50 | <ul id="update-progress-message-warnings" class="hidden"></ul> |
| 51 | 51 | <p id="update-progress-message"></p> |
| 52 | - <a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a> |
|
| 52 | + <a class="update-show-detailed"><?php p($l->t('Detailed logs')); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a> |
|
| 53 | 53 | <div id="update-progress-detailed" class="hidden"></div> |
| 54 | 54 | </div> |
| 55 | 55 | </div> |
@@ -18,8 +18,11 @@ discard block |
||
| 18 | 18 | <?php if(is_array($err)):?> |
| 19 | 19 | <?php print_unescaped($err['error']); ?> |
| 20 | 20 | <span class='hint'><?php print_unescaped($err['hint']); ?></span> |
| 21 | - <?php else: ?> |
|
| 22 | - <?php print_unescaped($err); ?> |
|
| 21 | + <?php else { |
|
| 22 | + : ?> |
|
| 23 | + <?php print_unescaped($err); |
|
| 24 | +} |
|
| 25 | +?> |
|
| 23 | 26 | <?php endif; ?> |
| 24 | 27 | </p> |
| 25 | 28 | <?php endforeach; ?> |
@@ -75,8 +78,12 @@ discard block |
||
| 75 | 78 | |
| 76 | 79 | <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
| 77 | 80 | <fieldset id='databaseBackend'> |
| 78 | - <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
|
| 79 | - $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
| 81 | + <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) { |
|
| 82 | + $hasOtherDB = true; |
|
| 83 | +} else { |
|
| 84 | + $hasOtherDB =false; |
|
| 85 | + } |
|
| 86 | + //other than SQLite ?> |
|
| 80 | 87 | <legend><?php p($l->t( 'Configure the database' )); ?></legend> |
| 81 | 88 | <div id="selectDbType"> |
| 82 | 89 | <?php foreach($_['databases'] as $type => $label): ?> |
@@ -88,11 +95,14 @@ discard block |
||
| 88 | 95 | <?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a> |
| 89 | 96 | </p> |
| 90 | 97 | <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> |
| 91 | - <?php else: ?> |
|
| 98 | + <?php else { |
|
| 99 | + : ?> |
|
| 92 | 100 | <input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>" |
| 93 | 101 | <?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/> |
| 94 | 102 | <label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label> |
| 95 | - <?php endif; ?> |
|
| 103 | + <?php endif; |
|
| 104 | +} |
|
| 105 | +?> |
|
| 96 | 106 | <?php endforeach; ?> |
| 97 | 107 | </div> |
| 98 | 108 | </fieldset> |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | script('core', [ |
| 3 | - 'jquery-showpassword', |
|
| 4 | - 'installation' |
|
| 3 | + 'jquery-showpassword', |
|
| 4 | + 'installation' |
|
| 5 | 5 | ]); |
| 6 | 6 | ?> |
| 7 | 7 | <input type='hidden' id='hasMySQL' value='<?php p($_['hasMySQL']) ?>'> |
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | <legend><strong><?php p($l->t('Security warning'));?></strong></legend> |
| 31 | 31 | <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br> |
| 32 | 32 | <?php print_unescaped($l->t( |
| 33 | - 'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.', |
|
| 34 | - [link_to_docs('admin-install')] |
|
| 35 | - )); ?></p> |
|
| 33 | + 'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.', |
|
| 34 | + [link_to_docs('admin-install')] |
|
| 35 | + )); ?></p> |
|
| 36 | 36 | </fieldset> |
| 37 | 37 | <?php endif; ?> |
| 38 | 38 | <fieldset id="adminaccount"> |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
| 77 | 77 | <fieldset id='databaseBackend'> |
| 78 | 78 | <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
| 79 | - $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
| 79 | + $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
| 80 | 80 | <legend><?php p($l->t( 'Configure the database' )); ?></legend> |
| 81 | 81 | <div id="selectDbType"> |
| 82 | 82 | <?php foreach($_['databases'] as $type => $label): ?> |
@@ -10,12 +10,12 @@ discard block |
||
| 10 | 10 | <input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'> |
| 11 | 11 | <form action="index.php" method="post"> |
| 12 | 12 | <input type="hidden" name="install" value="true"> |
| 13 | - <?php if(count($_['errors']) > 0): ?> |
|
| 13 | + <?php if (count($_['errors']) > 0): ?> |
|
| 14 | 14 | <fieldset class="warning"> |
| 15 | - <legend><strong><?php p($l->t('Error'));?></strong></legend> |
|
| 16 | - <?php foreach($_['errors'] as $err): ?> |
|
| 15 | + <legend><strong><?php p($l->t('Error')); ?></strong></legend> |
|
| 16 | + <?php foreach ($_['errors'] as $err): ?> |
|
| 17 | 17 | <p> |
| 18 | - <?php if(is_array($err)):?> |
|
| 18 | + <?php if (is_array($err)):?> |
|
| 19 | 19 | <?php print_unescaped($err['error']); ?> |
| 20 | 20 | <span class='hint'><?php print_unescaped($err['hint']); ?></span> |
| 21 | 21 | <?php else: ?> |
@@ -25,10 +25,10 @@ discard block |
||
| 25 | 25 | <?php endforeach; ?> |
| 26 | 26 | </fieldset> |
| 27 | 27 | <?php endif; ?> |
| 28 | - <?php if(!$_['htaccessWorking']): ?> |
|
| 28 | + <?php if (!$_['htaccessWorking']): ?> |
|
| 29 | 29 | <fieldset class="warning"> |
| 30 | - <legend><strong><?php p($l->t('Security warning'));?></strong></legend> |
|
| 31 | - <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br> |
|
| 30 | + <legend><strong><?php p($l->t('Security warning')); ?></strong></legend> |
|
| 31 | + <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.')); ?><br> |
|
| 32 | 32 | <?php print_unescaped($l->t( |
| 33 | 33 | 'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.', |
| 34 | 34 | [link_to_docs('admin-install')] |
@@ -36,35 +36,35 @@ discard block |
||
| 36 | 36 | </fieldset> |
| 37 | 37 | <?php endif; ?> |
| 38 | 38 | <fieldset id="adminaccount"> |
| 39 | - <legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend> |
|
| 39 | + <legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend> |
|
| 40 | 40 | <p class="grouptop"> |
| 41 | 41 | <input type="text" name="adminlogin" id="adminlogin" |
| 42 | - placeholder="<?php p($l->t( 'Username' )); ?>" |
|
| 42 | + placeholder="<?php p($l->t('Username')); ?>" |
|
| 43 | 43 | value="<?php p($_['adminlogin']); ?>" |
| 44 | 44 | autocomplete="off" autocapitalize="none" autocorrect="off" autofocus required> |
| 45 | - <label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label> |
|
| 45 | + <label for="adminlogin" class="infield"><?php p($l->t('Username')); ?></label> |
|
| 46 | 46 | </p> |
| 47 | 47 | <p class="groupbottom"> |
| 48 | 48 | <input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" |
| 49 | - placeholder="<?php p($l->t( 'Password' )); ?>" |
|
| 49 | + placeholder="<?php p($l->t('Password')); ?>" |
|
| 50 | 50 | value="<?php p($_['adminpass']); ?>" |
| 51 | 51 | autocomplete="off" autocapitalize="none" autocorrect="off" required> |
| 52 | - <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> |
|
| 52 | + <label for="adminpass" class="infield"><?php p($l->t('Password')); ?></label> |
|
| 53 | 53 | <input type="checkbox" id="show" name="show"> |
| 54 | 54 | <label for="show"></label> |
| 55 | 55 | </p> |
| 56 | 56 | </fieldset> |
| 57 | 57 | |
| 58 | - <?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
| 58 | + <?php if (!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
| 59 | 59 | <fieldset id="advancedHeader"> |
| 60 | - <legend><a id="showAdvanced"><?php p($l->t( 'Storage & database' )); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend> |
|
| 60 | + <legend><a id="showAdvanced"><?php p($l->t('Storage & database')); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend> |
|
| 61 | 61 | </fieldset> |
| 62 | 62 | <?php endif; ?> |
| 63 | 63 | |
| 64 | - <?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?> |
|
| 64 | + <?php if (!$_['directoryIsSet'] OR count($_['errors']) > 0): ?> |
|
| 65 | 65 | <fieldset id="datadirField"> |
| 66 | 66 | <div id="datadirContent"> |
| 67 | - <label for="directory"><?php p($l->t( 'Data folder' )); ?></label> |
|
| 67 | + <label for="directory"><?php p($l->t('Data folder')); ?></label> |
|
| 68 | 68 | <input type="text" name="directory" id="directory" |
| 69 | 69 | placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>" |
| 70 | 70 | value="<?php p($_['directory']); ?>" |
@@ -73,19 +73,19 @@ discard block |
||
| 73 | 73 | </fieldset> |
| 74 | 74 | <?php endif; ?> |
| 75 | 75 | |
| 76 | - <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
| 76 | + <?php if (!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
| 77 | 77 | <fieldset id='databaseBackend'> |
| 78 | - <?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
|
| 79 | - $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?> |
|
| 80 | - <legend><?php p($l->t( 'Configure the database' )); ?></legend> |
|
| 78 | + <?php if ($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) |
|
| 79 | + $hasOtherDB = true; else $hasOtherDB = false; //other than SQLite ?> |
|
| 80 | + <legend><?php p($l->t('Configure the database')); ?></legend> |
|
| 81 | 81 | <div id="selectDbType"> |
| 82 | - <?php foreach($_['databases'] as $type => $label): ?> |
|
| 83 | - <?php if(count($_['databases']) === 1): ?> |
|
| 82 | + <?php foreach ($_['databases'] as $type => $label): ?> |
|
| 83 | + <?php if (count($_['databases']) === 1): ?> |
|
| 84 | 84 | <p class="info"> |
| 85 | - <?php p($l->t( 'Only %s is available.', array($label) )); ?> |
|
| 86 | - <?php p($l->t( 'Install and activate additional PHP modules to choose other database types.' )); ?><br> |
|
| 85 | + <?php p($l->t('Only %s is available.', array($label))); ?> |
|
| 86 | + <?php p($l->t('Install and activate additional PHP modules to choose other database types.')); ?><br> |
|
| 87 | 87 | <a href="<?php print_unescaped(link_to_docs('admin-source_install')); ?>" target="_blank" rel="noreferrer noopener"> |
| 88 | - <?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a> |
|
| 88 | + <?php p($l->t('For more details check out the documentation.')); ?> ↗</a> |
|
| 89 | 89 | </p> |
| 90 | 90 | <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>"> |
| 91 | 91 | <?php else: ?> |
@@ -97,75 +97,75 @@ discard block |
||
| 97 | 97 | </div> |
| 98 | 98 | </fieldset> |
| 99 | 99 | |
| 100 | - <?php if($hasOtherDB): ?> |
|
| 100 | + <?php if ($hasOtherDB): ?> |
|
| 101 | 101 | <fieldset id='databaseField'> |
| 102 | 102 | <div id="use_other_db"> |
| 103 | 103 | <p class="grouptop"> |
| 104 | - <label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label> |
|
| 104 | + <label for="dbuser" class="infield"><?php p($l->t('Database user')); ?></label> |
|
| 105 | 105 | <input type="text" name="dbuser" id="dbuser" |
| 106 | - placeholder="<?php p($l->t( 'Database user' )); ?>" |
|
| 106 | + placeholder="<?php p($l->t('Database user')); ?>" |
|
| 107 | 107 | value="<?php p($_['dbuser']); ?>" |
| 108 | 108 | autocomplete="off" autocapitalize="none" autocorrect="off"> |
| 109 | 109 | </p> |
| 110 | 110 | <p class="groupmiddle"> |
| 111 | 111 | <input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword-toggle" |
| 112 | - placeholder="<?php p($l->t( 'Database password' )); ?>" |
|
| 112 | + placeholder="<?php p($l->t('Database password')); ?>" |
|
| 113 | 113 | value="<?php p($_['dbpass']); ?>" |
| 114 | 114 | autocomplete="off" autocapitalize="none" autocorrect="off"> |
| 115 | - <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label> |
|
| 115 | + <label for="dbpass" class="infield"><?php p($l->t('Database password')); ?></label> |
|
| 116 | 116 | <input type="checkbox" id="dbpassword-toggle" name="dbpassword-toggle"> |
| 117 | 117 | <label for="dbpassword-toggle"></label> |
| 118 | 118 | </p> |
| 119 | 119 | <p class="groupmiddle"> |
| 120 | - <label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label> |
|
| 120 | + <label for="dbname" class="infield"><?php p($l->t('Database name')); ?></label> |
|
| 121 | 121 | <input type="text" name="dbname" id="dbname" |
| 122 | - placeholder="<?php p($l->t( 'Database name' )); ?>" |
|
| 122 | + placeholder="<?php p($l->t('Database name')); ?>" |
|
| 123 | 123 | value="<?php p($_['dbname']); ?>" |
| 124 | 124 | autocomplete="off" autocapitalize="none" autocorrect="off" |
| 125 | 125 | pattern="[0-9a-zA-Z$_-]+"> |
| 126 | 126 | </p> |
| 127 | - <?php if($_['hasOracle']): ?> |
|
| 127 | + <?php if ($_['hasOracle']): ?> |
|
| 128 | 128 | <div id="use_oracle_db"> |
| 129 | 129 | <p class="groupmiddle"> |
| 130 | - <label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label> |
|
| 130 | + <label for="dbtablespace" class="infield"><?php p($l->t('Database tablespace')); ?></label> |
|
| 131 | 131 | <input type="text" name="dbtablespace" id="dbtablespace" |
| 132 | - placeholder="<?php p($l->t( 'Database tablespace' )); ?>" |
|
| 132 | + placeholder="<?php p($l->t('Database tablespace')); ?>" |
|
| 133 | 133 | value="<?php p($_['dbtablespace']); ?>" |
| 134 | 134 | autocomplete="off" autocapitalize="none" autocorrect="off"> |
| 135 | 135 | </p> |
| 136 | 136 | </div> |
| 137 | 137 | <?php endif; ?> |
| 138 | 138 | <p class="groupbottom"> |
| 139 | - <label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label> |
|
| 139 | + <label for="dbhost" class="infield"><?php p($l->t('Database host')); ?></label> |
|
| 140 | 140 | <input type="text" name="dbhost" id="dbhost" |
| 141 | - placeholder="<?php p($l->t( 'Database host' )); ?>" |
|
| 141 | + placeholder="<?php p($l->t('Database host')); ?>" |
|
| 142 | 142 | value="<?php p($_['dbhost']); ?>" |
| 143 | 143 | autocomplete="off" autocapitalize="none" autocorrect="off"> |
| 144 | 144 | </p> |
| 145 | 145 | <p class="info"> |
| 146 | - <?php p($l->t( 'Please specify the port number along with the host name (e.g., localhost:5432).' )); ?> |
|
| 146 | + <?php p($l->t('Please specify the port number along with the host name (e.g., localhost:5432).')); ?> |
|
| 147 | 147 | </p> |
| 148 | 148 | </div> |
| 149 | 149 | </fieldset> |
| 150 | 150 | <?php endif; ?> |
| 151 | 151 | <?php endif; ?> |
| 152 | 152 | |
| 153 | - <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
| 153 | + <?php if (!$_['dbIsSet'] OR count($_['errors']) > 0): ?> |
|
| 154 | 154 | <fieldset id="sqliteInformation" class="warning"> |
| 155 | - <legend><?php p($l->t('Performance warning'));?></legend> |
|
| 156 | - <p><?php p($l->t('SQLite will be used as database.'));?></p> |
|
| 157 | - <p><?php p($l->t('For larger installations we recommend to choose a different database backend.'));?></p> |
|
| 155 | + <legend><?php p($l->t('Performance warning')); ?></legend> |
|
| 156 | + <p><?php p($l->t('SQLite will be used as database.')); ?></p> |
|
| 157 | + <p><?php p($l->t('For larger installations we recommend to choose a different database backend.')); ?></p> |
|
| 158 | 158 | <p><?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?></p> |
| 159 | 159 | </fieldset> |
| 160 | 160 | <?php endif ?> |
| 161 | 161 | |
| 162 | 162 | <div class="icon-loading-dark float-spinner"> </div> |
| 163 | 163 | |
| 164 | - <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div> |
|
| 164 | + <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Finish setup')); ?>" data-finishing="<?php p($l->t('Finishing …')); ?>"></div> |
|
| 165 | 165 | |
| 166 | 166 | <p class="info"> |
| 167 | 167 | <span class="icon-info-white"></span> |
| 168 | - <?php p($l->t('Need help?'));?> |
|
| 169 | - <a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation'));?> ↗</a> |
|
| 168 | + <?php p($l->t('Need help?')); ?> |
|
| 169 | + <a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation')); ?> ↗</a> |
|
| 170 | 170 | </p> |
| 171 | 171 | </form> |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | - /** @var array $_ */ |
|
| 3 | - /** @var \OCP\IL10N $l */ |
|
| 2 | + /** @var array $_ */ |
|
| 3 | + /** @var \OCP\IL10N $l */ |
|
| 4 | 4 | |
| 5 | 5 | style('core', ['styles', 'header']); |
| 6 | 6 | ?> |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | <ul> |
| 15 | 15 | <li><?php p($l->t('Remote Address: %s', [$_['remoteAddr']])) ?></li> |
| 16 | 16 | <li><?php p($l->t('Request ID: %s', [$_['requestID']])) ?></li> |
| 17 | - <?php if($_['debugMode']): ?> |
|
| 17 | + <?php if ($_['debugMode']): ?> |
|
| 18 | 18 | <li><?php p($l->t('Type: %s', [$_['errorClass']])) ?></li> |
| 19 | 19 | <li><?php p($l->t('Code: %s', [$_['errorCode']])) ?></li> |
| 20 | 20 | <li><?php p($l->t('Message: %s', [$_['errorMsg']])) ?></li> |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | <?php endif; ?> |
| 24 | 24 | </ul> |
| 25 | 25 | |
| 26 | - <?php if($_['debugMode']): ?> |
|
| 26 | + <?php if ($_['debugMode']): ?> |
|
| 27 | 27 | <br /> |
| 28 | 28 | <h3><?php p($l->t('Trace')) ?></h3> |
| 29 | 29 | <pre><?php p($_['trace']) ?></pre> |
@@ -14,10 +14,13 @@ |
||
| 14 | 14 | ?> |
| 15 | 15 | <?php if (isset($_['content'])): ?> |
| 16 | 16 | <?php print_unescaped($_['content']) ?> |
| 17 | -<?php else: ?> |
|
| 17 | +<?php else { |
|
| 18 | + : ?> |
|
| 18 | 19 | <ul> |
| 19 | 20 | <li class="error"> |
| 20 | - <?php p($l->t('File not found')); ?><br> |
|
| 21 | + <?php p($l->t('File not found')); |
|
| 22 | +} |
|
| 23 | +?><br> |
|
| 21 | 24 | <p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p> |
| 22 | 25 | <p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p> |
| 23 | 26 | </li> |
@@ -4,11 +4,11 @@ |
||
| 4 | 4 | /** @var $theme OCP\Defaults */ |
| 5 | 5 | // @codeCoverageIgnoreStart |
| 6 | 6 | if(!isset($_)) {//standalone page is not supported anymore - redirect to / |
| 7 | - require_once '../../lib/base.php'; |
|
| 7 | + require_once '../../lib/base.php'; |
|
| 8 | 8 | |
| 9 | - $urlGenerator = \OC::$server->getURLGenerator(); |
|
| 10 | - header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
| 11 | - exit; |
|
| 9 | + $urlGenerator = \OC::$server->getURLGenerator(); |
|
| 10 | + header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
| 11 | + exit; |
|
| 12 | 12 | } |
| 13 | 13 | // @codeCoverageIgnoreEnd |
| 14 | 14 | ?> |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | /** @var $l \OCP\IL10N */ |
| 4 | 4 | /** @var $theme OCP\Defaults */ |
| 5 | 5 | // @codeCoverageIgnoreStart |
| 6 | -if(!isset($_)) {//standalone page is not supported anymore - redirect to / |
|
| 6 | +if (!isset($_)) {//standalone page is not supported anymore - redirect to / |
|
| 7 | 7 | require_once '../../lib/base.php'; |
| 8 | 8 | |
| 9 | 9 | $urlGenerator = \OC::$server->getURLGenerator(); |
| 10 | - header('Location: ' . $urlGenerator->getAbsoluteURL('/')); |
|
| 10 | + header('Location: '.$urlGenerator->getAbsoluteURL('/')); |
|
| 11 | 11 | exit; |
| 12 | 12 | } |
| 13 | 13 | // @codeCoverageIgnoreEnd |
@@ -29,46 +29,46 @@ |
||
| 29 | 29 | use \OCP\IUserManager; |
| 30 | 30 | |
| 31 | 31 | class UserController extends Controller { |
| 32 | - /** |
|
| 33 | - * @var IUserManager |
|
| 34 | - */ |
|
| 35 | - protected $userManager; |
|
| 32 | + /** |
|
| 33 | + * @var IUserManager |
|
| 34 | + */ |
|
| 35 | + protected $userManager; |
|
| 36 | 36 | |
| 37 | - public function __construct($appName, |
|
| 38 | - IRequest $request, |
|
| 39 | - IUserManager $userManager |
|
| 40 | - ) { |
|
| 41 | - parent::__construct($appName, $request); |
|
| 42 | - $this->userManager = $userManager; |
|
| 43 | - } |
|
| 37 | + public function __construct($appName, |
|
| 38 | + IRequest $request, |
|
| 39 | + IUserManager $userManager |
|
| 40 | + ) { |
|
| 41 | + parent::__construct($appName, $request); |
|
| 42 | + $this->userManager = $userManager; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Lookup user display names |
|
| 47 | - * |
|
| 48 | - * @NoAdminRequired |
|
| 49 | - * |
|
| 50 | - * @param array $users |
|
| 51 | - * |
|
| 52 | - * @return JSONResponse |
|
| 53 | - */ |
|
| 54 | - public function getDisplayNames($users) { |
|
| 55 | - $result = array(); |
|
| 45 | + /** |
|
| 46 | + * Lookup user display names |
|
| 47 | + * |
|
| 48 | + * @NoAdminRequired |
|
| 49 | + * |
|
| 50 | + * @param array $users |
|
| 51 | + * |
|
| 52 | + * @return JSONResponse |
|
| 53 | + */ |
|
| 54 | + public function getDisplayNames($users) { |
|
| 55 | + $result = array(); |
|
| 56 | 56 | |
| 57 | - foreach ($users as $user) { |
|
| 58 | - $userObject = $this->userManager->get($user); |
|
| 59 | - if (is_object($userObject)) { |
|
| 60 | - $result[$user] = $userObject->getDisplayName(); |
|
| 61 | - } else { |
|
| 62 | - $result[$user] = $user; |
|
| 63 | - } |
|
| 64 | - } |
|
| 57 | + foreach ($users as $user) { |
|
| 58 | + $userObject = $this->userManager->get($user); |
|
| 59 | + if (is_object($userObject)) { |
|
| 60 | + $result[$user] = $userObject->getDisplayName(); |
|
| 61 | + } else { |
|
| 62 | + $result[$user] = $user; |
|
| 63 | + } |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - $json = array( |
|
| 67 | - 'users' => $result, |
|
| 68 | - 'status' => 'success' |
|
| 69 | - ); |
|
| 66 | + $json = array( |
|
| 67 | + 'users' => $result, |
|
| 68 | + 'status' => 'success' |
|
| 69 | + ); |
|
| 70 | 70 | |
| 71 | - return new JSONResponse($json); |
|
| 71 | + return new JSONResponse($json); |
|
| 72 | 72 | |
| 73 | - } |
|
| 73 | + } |
|
| 74 | 74 | } |
@@ -34,28 +34,28 @@ |
||
| 34 | 34 | |
| 35 | 35 | class RemoveCertificate extends Base { |
| 36 | 36 | |
| 37 | - /** @var ICertificateManager */ |
|
| 38 | - protected $certificateManager; |
|
| 39 | - |
|
| 40 | - public function __construct(ICertificateManager $certificateManager) { |
|
| 41 | - $this->certificateManager = $certificateManager; |
|
| 42 | - parent::__construct(); |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - protected function configure() { |
|
| 46 | - $this |
|
| 47 | - ->setName('security:certificates:remove') |
|
| 48 | - ->setDescription('remove trusted certificate') |
|
| 49 | - ->addArgument( |
|
| 50 | - 'name', |
|
| 51 | - InputArgument::REQUIRED, |
|
| 52 | - 'the file name of the certificate to remove' |
|
| 53 | - ); |
|
| 54 | - } |
|
| 55 | - |
|
| 56 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 57 | - $name = $input->getArgument('name'); |
|
| 58 | - |
|
| 59 | - $this->certificateManager->removeCertificate($name); |
|
| 60 | - } |
|
| 37 | + /** @var ICertificateManager */ |
|
| 38 | + protected $certificateManager; |
|
| 39 | + |
|
| 40 | + public function __construct(ICertificateManager $certificateManager) { |
|
| 41 | + $this->certificateManager = $certificateManager; |
|
| 42 | + parent::__construct(); |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + protected function configure() { |
|
| 46 | + $this |
|
| 47 | + ->setName('security:certificates:remove') |
|
| 48 | + ->setDescription('remove trusted certificate') |
|
| 49 | + ->addArgument( |
|
| 50 | + 'name', |
|
| 51 | + InputArgument::REQUIRED, |
|
| 52 | + 'the file name of the certificate to remove' |
|
| 53 | + ); |
|
| 54 | + } |
|
| 55 | + |
|
| 56 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 57 | + $name = $input->getArgument('name'); |
|
| 58 | + |
|
| 59 | + $this->certificateManager->removeCertificate($name); |
|
| 60 | + } |
|
| 61 | 61 | } |