Browse Source

use json to encode user list

remotes/origin/stable6
Robin Appelman 13 years ago
parent
commit
6778a45d45
  1. 2
      apps/files/ajax/scan.php
  2. 2
      apps/files/js/files.js

2
apps/files/ajax/scan.php

@ -9,7 +9,7 @@ if (isset($_GET['users'])) {
if ($_GET['users'] === 'all') { if ($_GET['users'] === 'all') {
$users = OC_User::getUsers(); $users = OC_User::getUsers();
} else { } else {
$users = explode(',', $_GET['users']);
$users = json_decode($_GET['users']);
} }
} else { } else {
$users = array(OC_User::getUser()); $users = array(OC_User::getUser());

2
apps/files/js/files.js

@ -711,7 +711,7 @@ function scanFiles(force, dir, users){
if (users === 'all') { if (users === 'all') {
usersString = users; usersString = users;
} else { } else {
usersString = users.join(',');
usersString = JSON.stringify(users);
} }
scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir, users: usersString}); scannerEventSource = new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force: force,dir: dir, users: usersString});
} else { } else {

Loading…
Cancel
Save