mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use intval() for validation of config options 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-02-21 17:22:06 -06:00 committed by Bjoern Schiessle
parent 26c8f82ba2
commit fef75ff2c0
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/lib/Controller/ShareesAPIController.php
View File

@ -429,13 +429,13 @@ class ShareesAPIController extends OCSController {
public function search($search = '', $itemType = null, $page = 1, $perPage = 200, $shareType = null, $lookup = true) {
// only search for string larger than a given threshold
$threshold = $this->config->getSystemValue('sharing.minSearchStringLength', 0);
$threshold = intval($this->config->getSystemValue('sharing.minSearchStringLength', 0));
if (strlen($search) < $threshold) {
return new Http\DataResponse($this->result);
}
// never return more than the max. number of results configured in the config.php
$maxResults = $this->config->getSystemValue('sharing.maxAutocompleteResults', 0);
$maxResults = intval($this->config->getSystemValue('sharing.maxAutocompleteResults', 0));
if ($maxResults > 0) {
$perPage = min($perPage, $maxResults);
}

5
core/js/sharedialogview.js
View File

@ -267,7 +267,10 @@
// show a notice that the list is truncated
// this is the case if one of the search results is at least as long as the max result config option
if(Math.min(perPage, oc_config['sharing.maxAutocompleteResults']) <= Math.max(users.length, groups.length, remotes.length, emails.length, lookup.length)) {
if(oc_config['sharing.maxAutocompleteResults'] > 0 &&
Math.min(perPage, oc_config['sharing.maxAutocompleteResults'])
<= Math.max(users.length, groups.length, remotes.length, emails.length, lookup.length)) {
var message = t('core', 'This list is maybe truncated - please refine your search term to see more results.');
$('.ui-autocomplete').append('<li class="autocomplete-note">' + message + '</li>');
}

4
lib/private/Template/JSConfigHelper.php
View File

@ -207,8 +207,8 @@ class JSConfigHelper {
'enable_avatars' => $this->config->getSystemValue('enable_avatars', true) === true,
'lost_password_link'=> $this->config->getSystemValue('lost_password_link', null),
'modRewriteWorking' => ($this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true'),
'sharing.maxAutocompleteResults' => $this->config->getSystemValue('sharing.maxAutocompleteResults', 0),
'sharing.minSearchStringLength' => $this->config->getSystemValue('sharing.minSearchStringLength', 0),
'sharing.maxAutocompleteResults' => intval($this->config->getSystemValue('sharing.maxAutocompleteResults', 0)),
'sharing.minSearchStringLength' => intval($this->config->getSystemValue('sharing.minSearchStringLength', 0)),
]),
"oc_appconfig" => json_encode([
'core' => [