MDL-23619 fixed wrong param cleaning + other fixing

This commit is contained in:
Petr Skoda
2010-08-02 15:47:42 +00:00
parent c6fb49100c
commit 3136dc16fd
2 changed files with 11 additions and 15 deletions
+6 -6
View File
@@ -52,12 +52,12 @@ class repository_local extends repository {
if (!empty($encodedpath)) {
$params = unserialize(base64_decode($encodedpath));
if (is_array($params)) {
$itemid = clean_param($params['itemid'], PARAM_INT);
$filename = clean_param($params['filename'], PARAM_FILE);
$filearea = clean_param($params['filearea'], PARAM_ALPHAEXT);
$filepath = clean_param($params['filepath'], PARAM_PATH);;
$component = clean_param($params['component'], PARAM_ALPHAEXT);
$context = get_context_instance_by_id(clean_param($params['contextid'], PARAM_INT));
$component = is_null($params['component']) ? NULL : clean_param($params['component'], PARAM_ALPHAEXT);
$filearea = is_null($params['filearea']) ? NULL : clean_param($params['filearea'], PARAM_ALPHAEXT);
$itemid = is_null($params['itemid']) ? NULL : clean_param($params['itemid'], PARAM_INT);
$filepath = is_null($params['filepath']) ? NULL : clean_param($params['filepath'], PARAM_PATH);;
$filename = is_null($params['filename']) ? NULL : clean_param($params['filename'], PARAM_FILE);
$context = get_context_instance_by_id(clean_param($params['contextid'], PARAM_INT));
}
} else {
$itemid = null;
+5 -9
View File
@@ -52,21 +52,17 @@ class repository_user extends repository {
if (!empty($encodedpath)) {
$params = unserialize(base64_decode($encodedpath));
if (is_array($params)) {
$itemid = clean_param($params['itemid'], PARAM_INT);
$filename = clean_param($params['filename'], PARAM_FILE);
$filearea = clean_param($params['filearea'], PARAM_ALPHAEXT);
$filepath = clean_param($params['filepath'], PARAM_PATH);;
$component = clean_param($params['component'], PARAM_ALPHAEXT);
$context = get_context_instance_by_id(clean_param($params['contextid'], PARAM_INT));
$filename = clean_param($params['filename'], PARAM_FILE);
}
} else {
$itemid = 0;
$filename = null;
$filearea = 'private';
$filepath = '/';
$component = 'user';
$context = get_context_instance(CONTEXT_USER, $USER->id);
$filename = null;
}
$filearea = 'private';
$component = 'user';
$context = get_context_instance(CONTEXT_USER, $USER->id);
try {
$browser = get_file_browser();