Skip to content

Commit

Permalink
Fix non-existant function names
Browse files Browse the repository at this point in the history
  • Loading branch information
Caleb committed Dec 7, 2012
1 parent cdce703 commit f558a6d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions modules/webfm_jquery_upload/webfm_jquery_upload.module
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ function webfm_managed_file_value(&$element, $input = FALSE, $form_state = NULL)
}
if (!empty($input_values['upload_destination'])) {
$form_upload_dest = drupal_substr($input_values['upload_destination'], 1);
$form_upload_dest = drupal_trim(webfm_utf8_urldecode($form_upload_dest));
$form_upload_dest = trim(webfm_utf8_urldecode($form_upload_dest));
$tdest = file_default_scheme() . '://' . $form_upload_dest;
if (preg_match('/\.\./', $form_upload_dest) || !file_prepare_directory($tdest)) {
watchdog('webfm_jquery_upload', 'The upload directory %directory for the files field is invalid.', array('%directory' => $destination));
Expand Down Expand Up @@ -332,7 +332,7 @@ function webfm_managed_file_value(&$element, $input = FALSE, $form_state = NULL)
$extensions = variable_get('webfm_file_extensions', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp');
}
$frdata = array();
$extension_errors = webfm_file_validate_extensions($fname, $extensions);
$extension_errors = webfm_file_validate_extensions($name, $extensions);
if (count($extension_errors) > 0) {
$frdata = array('name' => $name, 'size' => $original_files['size'][$upload_name][$i], 'dest' => '/' . $form_upload_dest);
$frdata['invalid'] = TRUE;
Expand Down
38 changes: 19 additions & 19 deletions webfm.handlers.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
*/
function webfm_ajax_renamefile($params, &$response) {
// @todo Standarize path handling and sanitation
$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);

if (!webfm_is_valid_path($params[0])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
return;
}
$params[1] = drupal_trim(webfm_utf8_urldecode($params[1]));
$params[1] = trim(webfm_utf8_urldecode($params[1]));
if (!webfm_is_valid_filename($params[1])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
Expand Down Expand Up @@ -99,7 +99,7 @@ function webfm_is_valid_path($path, $check_root = TRUE) {
if ($path[0] == '/' || $path[0] == '\\')
return FALSE;

$path = drupal_str_replace('\\', '/', $path);
$path = str_replace('\\', '/', $path);

if ($check_root) {
foreach (module_implements('webfm_check_valid_path') as $module) {
Expand All @@ -108,10 +108,10 @@ function webfm_is_valid_path($path, $check_root = TRUE) {
return TRUE;
}

if (drupal_strpos($path, variable_get('webfm_root', "SITE")) !== 0)
if (strpos($path, variable_get('webfm_root', "SITE")) !== 0)
return FALSE;
}
return FALSE;
return TRUE;
}

function webfm_is_valid_directory($filename) {
Expand All @@ -138,13 +138,13 @@ function webfm_is_valid_filename($filename, $extensions = '') {
* Param1: Destination name for directory
*/
function webfm_ajax_renamedir($params, &$response) {
$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);
if (!webfm_is_valid_path($params[0]) || $params[0] == variable_get('webfm_root', "SITE")) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
return;
}
$params[1] = drupal_trim(webfm_utf8_urldecode($params[1]));
$params[1] = trim(webfm_utf8_urldecode($params[1]));
if (!webfm_is_valid_directory($params[1])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
Expand Down Expand Up @@ -224,13 +224,13 @@ function webfm_ajax_renamedir($params, &$response) {
*/
function webfm_ajax_movefile($params, &$response) {

$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);
if (!webfm_is_valid_path($params[0])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
return;
}
$params[1] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[1])), 1);
$params[1] = drupal_substr(trim(webfm_utf8_urldecode($params[1])), 1);
if (!webfm_is_valid_path($params[1]) || !is_dir(file_default_scheme() . '://' . $params[1])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
Expand Down Expand Up @@ -312,13 +312,13 @@ function webfm_ajax_movefile($params, &$response) {
*/
function webfm_ajax_movedir($params, &$response) {

$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);
if (!webfm_is_valid_path($params[0]) || $params[0] == variable_get('webfm_root', "SITE")) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
return;
}
$params[1] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[1])), 1);
$params[1] = drupal_substr(trim(webfm_utf8_urldecode($params[1])), 1);
if (!webfm_is_valid_path($params[1])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
Expand Down Expand Up @@ -407,7 +407,7 @@ function webfm_ajax_movedir($params, &$response) {
* Param0: Path to file
*/
function webfm_ajax_deletefile($params, &$response) {
$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);
if (!webfm_is_valid_path($params[0])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
Expand Down Expand Up @@ -462,7 +462,7 @@ function webfm_ajax_deletefile($params, &$response) {
* Param0: Path to directory
*/
function webfm_ajax_deletedir($params, &$response) {
$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);
if (!webfm_is_valid_path($params[0]) || $params[0] == variable_get('webfm_root', "SITE")) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
Expand Down Expand Up @@ -531,13 +531,13 @@ function webfm_ajax_deletedir($params, &$response) {
* Param1: Query string
*/
function webfm_ajax_search($params, &$response) {
$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);
if (!webfm_is_valid_path($params[0])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
return;
}
$params[1] = drupal_trim(webfm_utf8_urldecode($params[1]));
$params[1] = trim(webfm_utf8_urldecode($params[1]));
if (preg_match('/\.\./', $params[1])) {
$response['status'] = 'false';
$response['err'] = t('Invalid query');
Expand Down Expand Up @@ -576,13 +576,13 @@ function webfm_ajax_search($params, &$response) {
* Param1: Directory name
*/
function webfm_ajax_createdir($params, &$response) {
$params[0] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[0])), 1);
$params[0] = drupal_substr(trim(webfm_utf8_urldecode($params[0])), 1);
if (!webfm_is_valid_path($params[0])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
return;
}
$params[1] = drupal_trim(webfm_utf8_urldecode($params[1]));
$params[1] = trim(webfm_utf8_urldecode($params[1]));
if (!webfm_is_valid_directory($params[1])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
Expand Down Expand Up @@ -652,13 +652,13 @@ function webfm_ajax_resolveconflict($params, &$response) {
$response['status'] = 'false';
$response['err'] = t('Invalid file id');
}
$params[1] = drupal_substr(drupal_trim(webfm_utf8_urldecode($params[1])), 1);
$params[1] = drupal_substr(trim(webfm_utf8_urldecode($params[1])), 1);
if (!webfm_is_valid_path($params[1])) {
$response['status'] = 'false';
$response['err'] = t('Invalid path');
return;
}
$params[2] = drupal_trim(webfm_utf8_urldecode($params[2]));
$params[2] = trim(webfm_utf8_urldecode($params[2]));

$extensions = variable_get('webfm_file_extensions', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp');
$extension_errors = webfm_file_validate_extensions($params[2], $extensions);
Expand Down

0 comments on commit f558a6d

Please sign in to comment.