diff options
| -rw-r--r-- | modules/upload/upload.admin.inc | 151 | ||||
| -rw-r--r-- | modules/upload/upload.module | 151 |
2 files changed, 152 insertions, 150 deletions
diff --git a/modules/upload/upload.admin.inc b/modules/upload/upload.admin.inc new file mode 100644 index 000000000..570fc3980 --- /dev/null +++ b/modules/upload/upload.admin.inc @@ -0,0 +1,151 @@ +<?php + +/** + * Form API callback to validate the upload settings form. + */ +function upload_admin_settings_validate($form, &$form_state) { + if (($form_state['values']['upload_max_resolution'] != '0')) { + if (!preg_match('/^[0-9]+x[0-9]+$/', $form_state['values']['upload_max_resolution'])) { + form_set_error('upload_max_resolution', t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Set to 0 for no restriction.')); + } + } + + $default_uploadsize = $form_state['values']['upload_uploadsize_default']; + $default_usersize = $form_state['values']['upload_usersize_default']; + + $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size MB.', array('%size' => file_upload_max_size())) .'<br/>'; + $more_info = t("Depending on your sever environment, these settings may be changed in the system-wide php.ini file, a php.ini file in your Drupal root directory, in your Drupal site's settings.php file, or in the .htaccess file in your Drupal root directory."); + + if (!is_numeric($default_uploadsize) || ($default_uploadsize <= 0)) { + form_set_error('upload_uploadsize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default')))); + } + if (!is_numeric($default_usersize) || ($default_usersize <= 0)) { + form_set_error('upload_usersize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default')))); + } + if ($default_uploadsize > file_upload_max_size()) { + form_set_error('upload_uploadsize_default', $exceed_max_msg . $more_info); + $more_info = ''; + } + if ($default_uploadsize > $default_usersize) { + form_set_error('upload_uploadsize_default', t('The %role maximum file size per upload is greater than the total file size allowed per user', array('%role' => t('default')))); + } + + foreach ($form_state['values']['roles'] as $rid => $role) { + $uploadsize = $form_state['values']['upload_uploadsize_'. $rid]; + $usersize = $form_state['values']['upload_usersize_'. $rid]; + + if (!is_numeric($uploadsize) || ($uploadsize <= 0)) { + form_set_error('upload_uploadsize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role))); + } + if (!is_numeric($usersize) || ($usersize <= 0)) { + form_set_error('upload_usersize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role))); + } + if ($uploadsize > file_upload_max_size()) { + form_set_error('upload_uploadsize_'. $rid, $exceed_max_msg . $more_info); + $more_info = ''; + } + if ($uploadsize > $usersize) { + form_set_error('upload_uploadsize_'. $rid, t('The %role maximum file size per upload is greater than the total file size allowed per user', array('%role' => $role))); + } + } +} + +/** + * Menu callback for the upload settings form. + */ +function upload_admin_settings() { + $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'); + $upload_uploadsize_default = variable_get('upload_uploadsize_default', 1); + $upload_usersize_default = variable_get('upload_usersize_default', 1); + + $form['settings_general'] = array( + '#type' => 'fieldset', + '#title' => t('General settings'), + '#collapsible' => TRUE, + ); + $form['settings_general']['upload_max_resolution'] = array( + '#type' => 'textfield', + '#title' => t('Maximum resolution for uploaded images'), + '#default_value' => variable_get('upload_max_resolution', 0), + '#size' => 15, + '#maxlength' => 10, + '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))), + '#field_suffix' => '<kbd>'. t('WIDTHxHEIGHT') .'</kbd>' + ); + $form['settings_general']['upload_list_default'] = array( + '#type' => 'select', + '#title' => t('List files by default'), + '#default_value' => variable_get('upload_list_default', 1), + '#options' => array(0 => t('No'), 1 => t('Yes')), + '#description' => t('Set whether files attached to nodes are listed or not in the node view by default.'), + ); + + $form['settings_general']['upload_extensions_default'] = array( + '#type' => 'textfield', + '#title' => t('Default permitted file extensions'), + '#default_value' => $upload_extensions_default, + '#maxlength' => 255, + '#description' => t('Default extensions that users can upload. Separate extensions with a space and do not include the leading dot.'), + ); + $form['settings_general']['upload_uploadsize_default'] = array( + '#type' => 'textfield', + '#title' => t('Default maximum file size per upload'), + '#default_value' => $upload_uploadsize_default, + '#size' => 5, + '#maxlength' => 5, + '#description' => t('The default maximum file size a user can upload. If an image is uploaded and a maximum resolution is set, the size will be checked after the file has been resized.'), + '#field_suffix' => t('MB'), + ); + $form['settings_general']['upload_usersize_default'] = array( + '#type' => 'textfield', + '#title' => t('Default total file size per user'), + '#default_value' => $upload_usersize_default, + '#size' => 5, + '#maxlength' => 5, + '#description' => t('The default maximum size of all files a user can have on the site.'), + '#field_suffix' => t('MB'), + ); + + $form['settings_general']['upload_max_size'] = array('#value' => '<p>'. t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) .'</p>'); + + $roles = user_roles(0, 'upload files'); + $form['roles'] = array('#type' => 'value', '#value' => $roles); + + foreach ($roles as $rid => $role) { + $form['settings_role_'. $rid] = array( + '#type' => 'fieldset', + '#title' => t('Settings for @role', array('@role' => $role)), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['settings_role_'. $rid]['upload_extensions_'. $rid] = array( + '#type' => 'textfield', + '#title' => t('Permitted file extensions'), + '#default_value' => variable_get('upload_extensions_'. $rid, $upload_extensions_default), + '#maxlength' => 255, + '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.'), + ); + $form['settings_role_'. $rid]['upload_uploadsize_'. $rid] = array( + '#type' => 'textfield', + '#title' => t('Maximum file size per upload'), + '#default_value' => variable_get('upload_uploadsize_'. $rid, $upload_uploadsize_default), + '#size' => 5, + '#maxlength' => 5, + '#description' => t('The maximum size of a file a user can upload. If an image is uploaded and a maximum resolution is set, the size will be checked after the file has been resized.'), + '#field_suffix' => t('MB'), + ); + $form['settings_role_'. $rid]['upload_usersize_'. $rid] = array( + '#type' => 'textfield', + '#title' => t('Total file size per user'), + '#default_value' => variable_get('upload_usersize_'. $rid, $upload_usersize_default), + '#size' => 5, + '#maxlength' => 5, + '#description' => t('The maximum size of all files a user can have on the site.'), + '#field_suffix' => t('MB'), + ); + } + + $form['#validate'] = array('upload_admin_settings_validate'); + + return system_settings_form($form); +}
\ No newline at end of file diff --git a/modules/upload/upload.module b/modules/upload/upload.module index 5591c7fd1..4ceb81887 100644 --- a/modules/upload/upload.module +++ b/modules/upload/upload.module @@ -89,6 +89,7 @@ function upload_menu() { 'page arguments' => array('upload_admin_settings'), 'access arguments' => array('administer site configuration'), 'type' => MENU_NORMAL_ITEM, + 'file' => 'upload.admin.inc', ); return $items; } @@ -98,156 +99,6 @@ function upload_menu_alter(&$items) { } /** - * Form API callback to validate the upload settings form. - */ -function upload_admin_settings_validate($form, &$form_state) { - if (($form_state['values']['upload_max_resolution'] != '0')) { - if (!preg_match('/^[0-9]+x[0-9]+$/', $form_state['values']['upload_max_resolution'])) { - form_set_error('upload_max_resolution', t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Set to 0 for no restriction.')); - } - } - - $default_uploadsize = $form_state['values']['upload_uploadsize_default']; - $default_usersize = $form_state['values']['upload_usersize_default']; - - $exceed_max_msg = t('Your PHP settings limit the maximum file size per upload to %size MB.', array('%size' => file_upload_max_size())) .'<br/>'; - $more_info = t("Depending on your sever environment, these settings may be changed in the system-wide php.ini file, a php.ini file in your Drupal root directory, in your Drupal site's settings.php file, or in the .htaccess file in your Drupal root directory."); - - if (!is_numeric($default_uploadsize) || ($default_uploadsize <= 0)) { - form_set_error('upload_uploadsize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default')))); - } - if (!is_numeric($default_usersize) || ($default_usersize <= 0)) { - form_set_error('upload_usersize_default', t('The %role file size limit must be a number and greater than zero.', array('%role' => t('default')))); - } - if ($default_uploadsize > file_upload_max_size()) { - form_set_error('upload_uploadsize_default', $exceed_max_msg . $more_info); - $more_info = ''; - } - if ($default_uploadsize > $default_usersize) { - form_set_error('upload_uploadsize_default', t('The %role maximum file size per upload is greater than the total file size allowed per user', array('%role' => t('default')))); - } - - foreach ($form_state['values']['roles'] as $rid => $role) { - $uploadsize = $form_state['values']['upload_uploadsize_'. $rid]; - $usersize = $form_state['values']['upload_usersize_'. $rid]; - - if (!is_numeric($uploadsize) || ($uploadsize <= 0)) { - form_set_error('upload_uploadsize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role))); - } - if (!is_numeric($usersize) || ($usersize <= 0)) { - form_set_error('upload_usersize_'. $rid, t('The %role file size limit must be a number and greater than zero.', array('%role' => $role))); - } - if ($uploadsize > file_upload_max_size()) { - form_set_error('upload_uploadsize_'. $rid, $exceed_max_msg . $more_info); - $more_info = ''; - } - if ($uploadsize > $usersize) { - form_set_error('upload_uploadsize_'. $rid, t('The %role maximum file size per upload is greater than the total file size allowed per user', array('%role' => $role))); - } - } -} - -/** - * Menu callback for the upload settings form. - */ -function upload_admin_settings() { - $upload_extensions_default = variable_get('upload_extensions_default', 'jpg jpeg gif png txt html doc xls pdf ppt pps odt ods odp'); - $upload_uploadsize_default = variable_get('upload_uploadsize_default', 1); - $upload_usersize_default = variable_get('upload_usersize_default', 1); - - $form['settings_general'] = array( - '#type' => 'fieldset', - '#title' => t('General settings'), - '#collapsible' => TRUE, - ); - $form['settings_general']['upload_max_resolution'] = array( - '#type' => 'textfield', - '#title' => t('Maximum resolution for uploaded images'), - '#default_value' => variable_get('upload_max_resolution', 0), - '#size' => 15, - '#maxlength' => 10, - '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an <a href="!image-toolkit-link">image toolkit</a> is installed, files exceeding this value will be scaled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))), - '#field_suffix' => '<kbd>'. t('WIDTHxHEIGHT') .'</kbd>' - ); - $form['settings_general']['upload_list_default'] = array( - '#type' => 'select', - '#title' => t('List files by default'), - '#default_value' => variable_get('upload_list_default', 1), - '#options' => array(0 => t('No'), 1 => t('Yes')), - '#description' => t('Set whether files attached to nodes are listed or not in the node view by default.'), - ); - - $form['settings_general']['upload_extensions_default'] = array( - '#type' => 'textfield', - '#title' => t('Default permitted file extensions'), - '#default_value' => $upload_extensions_default, - '#maxlength' => 255, - '#description' => t('Default extensions that users can upload. Separate extensions with a space and do not include the leading dot.'), - ); - $form['settings_general']['upload_uploadsize_default'] = array( - '#type' => 'textfield', - '#title' => t('Default maximum file size per upload'), - '#default_value' => $upload_uploadsize_default, - '#size' => 5, - '#maxlength' => 5, - '#description' => t('The default maximum file size a user can upload. If an image is uploaded and a maximum resolution is set, the size will be checked after the file has been resized.'), - '#field_suffix' => t('MB'), - ); - $form['settings_general']['upload_usersize_default'] = array( - '#type' => 'textfield', - '#title' => t('Default total file size per user'), - '#default_value' => $upload_usersize_default, - '#size' => 5, - '#maxlength' => 5, - '#description' => t('The default maximum size of all files a user can have on the site.'), - '#field_suffix' => t('MB'), - ); - - $form['settings_general']['upload_max_size'] = array('#value' => '<p>'. t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))) .'</p>'); - - $roles = user_roles(0, 'upload files'); - $form['roles'] = array('#type' => 'value', '#value' => $roles); - - foreach ($roles as $rid => $role) { - $form['settings_role_'. $rid] = array( - '#type' => 'fieldset', - '#title' => t('Settings for @role', array('@role' => $role)), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $form['settings_role_'. $rid]['upload_extensions_'. $rid] = array( - '#type' => 'textfield', - '#title' => t('Permitted file extensions'), - '#default_value' => variable_get('upload_extensions_'. $rid, $upload_extensions_default), - '#maxlength' => 255, - '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.'), - ); - $form['settings_role_'. $rid]['upload_uploadsize_'. $rid] = array( - '#type' => 'textfield', - '#title' => t('Maximum file size per upload'), - '#default_value' => variable_get('upload_uploadsize_'. $rid, $upload_uploadsize_default), - '#size' => 5, - '#maxlength' => 5, - '#description' => t('The maximum size of a file a user can upload. If an image is uploaded and a maximum resolution is set, the size will be checked after the file has been resized.'), - '#field_suffix' => t('MB'), - ); - $form['settings_role_'. $rid]['upload_usersize_'. $rid] = array( - '#type' => 'textfield', - '#title' => t('Total file size per user'), - '#default_value' => variable_get('upload_usersize_'. $rid, $upload_usersize_default), - '#size' => 5, - '#maxlength' => 5, - '#description' => t('The maximum size of all files a user can have on the site.'), - '#field_suffix' => t('MB'), - ); - } - - $form['#validate'] = array('upload_admin_settings_validate'); - - return system_settings_form($form); -} - -/** * Determine the limitations on files that a given user may upload. The user * may be in multiple roles so we select the most permissive limitations from * all of their roles. |