- The upload (filehandler) module has landed!

database/database.mysql

@@ -207,6 +207,21 @@ CREATE TABLE directory (
   PRIMARY KEY  (link)
 ) TYPE=MyISAM;
 
+--
+-- Table structure for table 'files'
+--
+
+CREATE TABLE files (
+  fid int(10) unsigned NOT NULL default '0',
+  nid int(10) unsigned NOT NULL default '0',
+  filename varchar(255) NOT NULL default '',
+  filepath varchar(255) NOT NULL default '',
+  filemime varchar(255) NOT NULL default '',
+  filesize int(10) unsigned NOT NULL default '0',
+  list tinyint(1) unsigned NOT NULL default '0',
+  PRIMARY KEY  (fid)
+) TYPE=MyISAM;
+
 --
 -- Table structure for table 'filter_formats'
 --

database/database.pgsql

@@ -208,6 +208,21 @@ CREATE TABLE directory (
   PRIMARY KEY  (link)
 );
 
+--
+-- Table structure for table 'files'
+--
+
+CREATE TABLE files (
+  fid int(10) unsigned NOT NULL default '0',
+  nid int(10) unsigned NOT NULL default '0',
+  filename varchar(255) NOT NULL default '',
+  filepath varchar(255) NOT NULL default '',
+  filemime varchar(255) NOT NULL default '',
+  filesize int(10) unsigned NOT NULL default '0',
+  list tinyint(1) unsigned NOT NULL default '0',
+  PRIMARY KEY  (fid)
+);
+
 --
 -- Table structure for table 'filters'
 --

database/updates.inc

@@ -73,7 +73,8 @@
   "2004-08-09" => "update_99",
   "2004-08-10" => "update_100",
   "2004-08-11" => "update_101",
-  "2004-08-12" => "update_102"
+  "2004-08-12" => "update_102",
+  "2004-08-17" => "update_103"
 );
 
 function update_32() {
@@ -1506,6 +1507,21 @@ function update_102() {
   return array(update_sql("INSERT INTO {system} (filename, name, type, description, status, throttle, bootstrap) VALUES ('modules/legacy.module', 'legacy', 'module', '', 1, 0, 0)"));
 }
 
+function update_103() {
+  $ret = array();
+  $ret[] = update_sql("CREATE TABLE files (
+    fid int(10) unsigned NOT NULL default '0',
+    nid int(10) unsigned NOT NULL default '0',
+    filename varchar(255) NOT NULL default '',
+    filepath varchar(255) NOT NULL default '',
+    filemime varchar(255) NOT NULL default '',
+    filesize int(10) unsigned NOT NULL default '0',
+    list tinyint(1) unsigned NOT NULL default '0',
+    PRIMARY KEY  (fid)
+  )");
+  return $ret;
+}
+
 function update_sql($sql) {
   $edit = $_POST["edit"];
   $result = db_query($sql);

includes/common.inc

@@ -1794,6 +1794,34 @@ function truncate_utf8($string, $len) {
   return substr($string, 0, $len);
 }
 
+/**
+ * Encodes MIME/HTTP header values that contain non US-ASCII
+ * characters.
+ *
+ * Example: mime_header_encode('tést.txt') returns '=?UTF-8?B?dMOpc3QudHh0?='
+ *
+ * For more info: http://www.rfc-editor.org/rfc/rfc2047.txt
+ *
+ */
+function mime_header_encode($string, $charset = 'UTF-8') {
+  // Notes:
+  //   - Only encode strings that contain non-ASCII characters.
+  //   - The chunks come in groupings of 4 bytes when using base64
+  //     encoded.
+  //   - trim() is used to ensure that no extra spacing is added by
+  //     chunk_split() or preg_replace().
+  //   - Using \n as the chunk separator may cause problems on some
+  //     systems and may have to be changed to \r\n or \r.
+
+  if (!preg_match('/^[\x20-\x7E]*$/', $string)) {
+    $chunk_size = 75 - 7 - strlen($charset);
+    $chunk_size -= $chunk_size % 4;
+    $string = trim(chunk_split(base64_encode($string), $chunk_size, "\n"));
+    $string = trim(preg_replace('/^(.*)$/m', " =?$charset?B?\\1?=", $string));
+  }
+  return $string;
+}
+
 /**
  * Wrapper around PHP's eval(). Uses output buffering to capture both returned
  * and printed text. Unlike eval(), we require code to be surrounded by <?php ?>

includes/file.inc

@@ -9,7 +9,10 @@
 
 define('FILE_DOWNLOADS_PUBLIC', 1);
 define('FILE_DOWNLOADS_PRIVATE', 2);
-define('FILE_SEPARATOR', PHP_OS == 'WINNT' ? '\\' : '/');
+#define('FILE_SEPARATOR', PHP_OS == 'WINNT' ? '\\' : '/');
+define('FILE_SEPARATOR', '/');
+define('FILE_CREATE_DIRECTORY', 1);
+define('FILE_MODIFY_PERMISSIONS', 2);
 
 /**
  * Create the download path to a file.
@@ -20,8 +23,7 @@ function file_create_url($path) {
   }
   switch (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC)) {
     case FILE_DOWNLOADS_PUBLIC:
-      global $base_url;
-      return $base_url .'/'. variable_get('file_directory_path', 'files') .'/'. str_replace('\\', '/', $path);
+      return $GLOBALS['base_url'] .'/'. variable_get('file_directory_path', 'files') .'/'. str_replace('\\', '/', $path);
     case FILE_DOWNLOADS_PRIVATE:
       return url('system/files', 'file='. $path);
   }
@@ -49,11 +51,38 @@ function file_create_path($dest = 0) {
  * Check that directory exists and is writable.
  *
  * @param $directory Path to extract and verify directory for.
+ * @param $mode Try to create the directory if it does not exist.
+ * @param $form_item Optional name for a field item to attach potential errors to.
  * @return False when directory not found, or true when directory exists.
  */
-function file_check_directory(&$directory) {
+function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
   $directory = rtrim($directory, '/\\');
-  return is_dir($directory) && is_writable($directory);
+
+  // Check if directory exists.
+  if (!is_dir($directory)) {
+    if (($mode & FILE_CREATE_DIRECTORY) && mkdir($directory, 0760)) {
+      drupal_set_message(t("Created directory '%name'.", array('%name' => $directory)));
+    }
+    else {
+      if ($form_item) {
+        form_set_error($form_item, t("The directory '%name' does not exist.", array('%name' => $directory)));
+      }
+      return false;
+    }
+  }
+
+  // Check to see if the directory is writable.
+  if (!is_writable($directory)) {
+    if (($mode & FILE_MODIFY_PERMISSIONS) && chmod($directory, 0760)) {
+      drupal_set_message(t("Modified permissions on directory '%name'.", array('%name' => $directory)));
+    }
+    else {
+      form_set_error($form_item, t("The directory '%name' is not writable.", array('%name' => $directory)));
+      return false;
+    }
+  }
+
+  return true;
 }
 
 /**
@@ -84,19 +113,25 @@ function file_check_path(&$path) {
  */
 function file_check_upload($source) {
   if (is_object($source)) {
-    if (is_file($source->path)) {
+    if (is_file($source->filepath)) {
       return $source;
     }
   }
   elseif ($_FILES["edit"]["name"][$source] && is_uploaded_file($_FILES["edit"]["tmp_name"][$source])) {
-    $file->name = trim(basename($_FILES["edit"]["name"][$source]), '.');
-    $file->type = $_FILES["edit"]["type"][$source];
-    $file->path = $_FILES["edit"]["tmp_name"][$source];
+    $file->filename = trim(basename($_FILES["edit"]["name"][$source]), '.');
+    $file->filemime = $_FILES["edit"]["type"][$source];
+    $file->filepath = $_FILES["edit"]["tmp_name"][$source];
     $file->error = $_FILES["edit"]["error"][$source];
-    $file->size = $_FILES["edit"]["size"][$source];
-    $file->source = $_FILES["edit"]["source"][$source];
+    $file->filesize = $_FILES["edit"]["size"][$source];
+    $file->source = $source;
     return $file;
   }
+  else {
+    // In case of previews return previous file object.
+    if (file_exists($_SESSION['file_uploads'][$source]->filepath)) {
+      return $_SESSION['file_uploads'][$source];
+    }
+  }
 }
 
 /**
@@ -154,9 +189,9 @@ function file_copy(&$source, $dest = 0, $replace = 0) {
   // Process a file upload object.
   if (is_object($source)) {
     $file = $source;
-    $source = $file->path;
+    $source = $file->filepath;
     if (!$basename) {
-      $basename = $file->name;
+      $basename = $file->filename;
     }
   }
 
@@ -170,45 +205,53 @@ function file_copy(&$source, $dest = 0, $replace = 0) {
   $basename = $basename ? $basename : basename($source);
   $dest = $directory . FILE_SEPARATOR . $basename;
 
-  if (file_exists($dest) && !$replace) {
-    // Destination file already exists and we can't replace is so we try and
-    // and find a new filename.
-    $pos = strrpos($basename, '.');
-    $name = substr($basename, 0, $pos);
-    if ($pos = strrpos($basename, '.')) {
-      $name = substr($basename, 0, $pos);
-      $ext = substr($basename, $pos);
-    }
-    else {
-      $name = $basename;
-    }
+  // Make sure source and destination filenames are not the same, makes no sense
+  // to copy it if they are. In fact copying the file will most likely result in
+  // a 0 byte file. Which is bad. Real bad.
+  if ($source != realpath($dest)) {
+    if (file_exists($dest) && !$replace) {
+      // Destination file already exists and we can't replace is so we try and
+      // and find a new filename.
+      if ($pos = strrpos($basename, '.')) {
+        $name = substr($basename, 0, $pos);
+        $ext = substr($basename, $pos);
+      }
+      else {
+        $name = $basename;
+      }
 
-    $counter = 0;
-    do {
-      $dest = $directory . FILE_SEPARATOR . $name .'_'. $counter++ . $ext;
-    } while (file_exists($dest));
-  }
+      $counter = 0;
+      do {
+        $dest = $directory . FILE_SEPARATOR . $name .'_'. $counter++ . $ext;
+      } while (file_exists($dest));
+    }
 
-  if (!copy($source, $dest)) {
-    drupal_set_message(t('File copy failed.'), 'error');
-    return 0;
+    if (!copy($source, $dest)) {
+      drupal_set_message(t('File copy failed.'), 'error');
+      return 0;
+    }
   }
 
   if (is_object($file)) {
-    $file->name = $basename;
-    $file->path = $dest;
+    $file->filename = $basename;
+    $file->filepath = $dest;
     $source = $file;
   }
   else {
     $source = $dest;
   }
+
   return 1; // Everything went ok.
 }
 
 function file_move(&$source, $dest = 0, $replace = 0) {
-  $path = is_object($source) ? $source->path : $source;
+
+  $path_original = is_object($source) ? $source->filepath : $source;
+
   if (file_copy($source, $dest, $replace)) {
-    if (unlink($path)) {
+    $path_current = is_object($source) ? $source->filepath : $source;
+
+    if ($path_original == $path_current || file_delete($path_original)) {
       return 1;
     }
     drupal_set_message(t('Removing original file failed.'), 'error');
@@ -216,9 +259,31 @@ function file_move(&$source, $dest = 0, $replace = 0) {
   return 0;
 }
 
+function file_create_filename($basename, $directory) {
+  $dest = $directory . FILE_SEPARATOR . $basename;
+
+  if (file_exists($dest)) {
+    // Destination file already exists, generate an alternative.
+    if ($pos = strrpos($basename, '.')) {
+      $name = substr($basename, 0, $pos);
+      $ext = substr($basename, $pos);
+    }
+    else {
+      $name = $basename;
+    }
+
+    $counter = 0;
+    do {
+      $dest = $directory . FILE_SEPARATOR . $name .'_'. $counter++ . $ext;
+    } while (file_exists($dest));
+  }
+
+  return $dest;
+}
+
 function file_delete($path) {
   if (is_file($path)) {
-    unlink($path);
+    return unlink($path);
   }
 }
 
@@ -241,7 +306,7 @@ function file_save_upload($source, $dest = 0, $replace = 0) {
     if (!$dest) {
       $dest = variable_get('file_directory_temp', (PHP_OS == 'WINNT' ? 'c:\\windows\\temp' : '/tmp'));
       $temporary = 1;
-      if (is_file($_SESSION['file_uploads'][$source]->path)) {
+      if (is_file($file->filepath)) {
         // If this file was uploaded by this user before replace the temporary copy.
         $replace = 1;
       }
@@ -273,18 +338,12 @@ function file_save_upload($source, $dest = 0, $replace = 0) {
     unset($_SESSION['file_uploads'][is_object($source) ? $source->source : $source]);
     if (file_move($file, $dest, $replace)) {
       if ($temporary) {
-        $_SESSION['file_uploads'][$source] = $file;
+        $_SESSION['file_uploads'][is_object($source) ? $source->source : $source] = $file;
       }
       return $file;
     }
     return 0;
   }
-  else {
-    // In case of previews return previous file object.
-    if (file_exists($_SESSION['file_uploads'][$source]->path)) {
-      return $_SESSION['file_uploads'][$source];
-    }
-  }
   return 0;
 }
 
@@ -305,7 +364,7 @@ function file_save_data($data, $dest, $replace = 0) {
 
   $temp = variable_get('file_directory_temp', (PHP_OS == 'WINNT' ? 'c:\\windows\\temp' : '/tmp'));
   $file = tempnam($temp, 'file');
-  if (!$fp = fopen($file, 'w')) {
+  if (!$fp = fopen($file, 'wb')) {
     drupal_set_message(t('Unable to create file.'), 'error');
     return 0;
   }
@@ -378,7 +437,7 @@ function file_scan_directory($dir, $mask, $nomask = array('.', '..', 'CVS'), $ca
         }
         elseif (ereg($mask, $file)) {
           $name = basename($file);
-          $files["$dir/$file"]->filename = "$dir/$file";
+          $files["$dir/$file"]->path = "$dir/$file";
           $files["$dir/$file"]->name = substr($name, 0, strrpos($name, '.'));
           if ($callback) {
             $callback("$dir/$file");

misc/drupal.css

@@ -198,6 +198,10 @@ tr.light .form-item, tr.dark .form-item {
   margin-right: 2em;
   margin-bottom: 1em;
 }
+.node-form .attachments fieldset {
+  float: none;
+  display: block;
+}
 .ok {
   color: #080;
 }

modules/node.module

@@ -1127,6 +1127,9 @@ function node_form($edit) {
 
   $output .= '<div class="node-form">';
 
+  // Add hidden 'op' variable, which specifies the default operation (Preview).
+  $output .= '<input type="hidden" name="op" value="'. check_form(t('Preview')) ."\" />\n";
+
   // Add the admin-specific parts/
 
   if (user_access('administer nodes')) {

modules/node/node.module

@@ -1127,6 +1127,9 @@ function node_form($edit) {
 
   $output .= '<div class="node-form">';
 
+  // Add hidden 'op' variable, which specifies the default operation (Preview).
+  $output .= '<input type="hidden" name="op" value="'. check_form(t('Preview')) ."\" />\n";
+
   // Add the admin-specific parts/
 
   if (user_access('administer nodes')) {

modules/system.module

@@ -152,17 +152,13 @@ function system_view_general() {
 
   // file system:
   $directory_path = variable_get('file_directory_path', 'files');
-  if (!file_check_directory($directory_path)) {
-    form_set_error('file_directory_path', t("The directory '%name' does not exist, or is not writable.", array('%name' => $directory_path)));
-  }
+  file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path');
 
-  $directory_temp = variable_get('file_directory_temp', (PHP_OS == 'WINNT' ? 'c:\\windows\\temp' : '/tmp'));
-  if (!file_check_directory($directory_temp)) {
-    form_set_error('file_directory_temp', t("The directory '%name' does not exist, or is not writable.", array('%name' => $directory_temp)));
-  }
+  $directory_temp = variable_get('file_directory_temp', 'temp');
+  file_check_directory(file_create_path($directory_temp), FILE_CREATE_DIRECTORY, 'file_directory_temp');
 
   $group = form_textfield(t('File system path'), 'file_directory_path', $directory_path, 70, 255, t('A file system path where the files will be stored. This directory has to exist and be writable by Drupal. If the download method is set to public this directory has to be relative to Drupal installation directory, and be accessible over the web. When download method is set to private this directory should not be accessible over the web. Changing this location after the site has been in use will cause problems so only change this setting on an existing site if you know what you are doing.'));
-  $group .= form_textfield(t('Temporary directory'), 'file_directory_temp', $directory_temp, 70, 255, t('Location where files can be saved temporarily. This directory should not be accessible from the web.'));
+  $group .= form_textfield(t('Temporary directory'), 'file_directory_temp', $directory_temp, 70, 255, t('Location where uploaded files will be placed for preview purposes. This directory should be relative to the file system path.'));
   $group .= form_radios(t('Download method'), 'file_downloads', variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC), array(FILE_DOWNLOADS_PUBLIC => t('Public - files are available using http directly.'), FILE_DOWNLOADS_PRIVATE => t('Private - files are be transferred by Drupal.')), t('This setting can be changed at any time, however, all download URLs will change and there may be unexpected problems so it is not recommended.'));
   $output .= form_group(t('File system settings'), $group);
 

modules/system/system.module

@@ -152,17 +152,13 @@ function system_view_general() {
 
   // file system:
   $directory_path = variable_get('file_directory_path', 'files');
-  if (!file_check_directory($directory_path)) {
-    form_set_error('file_directory_path', t("The directory '%name' does not exist, or is not writable.", array('%name' => $directory_path)));
-  }
+  file_check_directory($directory_path, FILE_CREATE_DIRECTORY, 'file_directory_path');
 
-  $directory_temp = variable_get('file_directory_temp', (PHP_OS == 'WINNT' ? 'c:\\windows\\temp' : '/tmp'));
-  if (!file_check_directory($directory_temp)) {
-    form_set_error('file_directory_temp', t("The directory '%name' does not exist, or is not writable.", array('%name' => $directory_temp)));
-  }
+  $directory_temp = variable_get('file_directory_temp', 'temp');
+  file_check_directory(file_create_path($directory_temp), FILE_CREATE_DIRECTORY, 'file_directory_temp');
 
   $group = form_textfield(t('File system path'), 'file_directory_path', $directory_path, 70, 255, t('A file system path where the files will be stored. This directory has to exist and be writable by Drupal. If the download method is set to public this directory has to be relative to Drupal installation directory, and be accessible over the web. When download method is set to private this directory should not be accessible over the web. Changing this location after the site has been in use will cause problems so only change this setting on an existing site if you know what you are doing.'));
-  $group .= form_textfield(t('Temporary directory'), 'file_directory_temp', $directory_temp, 70, 255, t('Location where files can be saved temporarily. This directory should not be accessible from the web.'));
+  $group .= form_textfield(t('Temporary directory'), 'file_directory_temp', $directory_temp, 70, 255, t('Location where uploaded files will be placed for preview purposes. This directory should be relative to the file system path.'));
   $group .= form_radios(t('Download method'), 'file_downloads', variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC), array(FILE_DOWNLOADS_PUBLIC => t('Public - files are available using http directly.'), FILE_DOWNLOADS_PRIVATE => t('Private - files are be transferred by Drupal.')), t('This setting can be changed at any time, however, all download URLs will change and there may be unexpected problems so it is not recommended.'));
   $output .= form_group(t('File system settings'), $group);
 

modules/user.module

@@ -182,8 +182,8 @@ function user_validate_picture($file, &$edit, $user) {
 
   // Check that uploaded file is an image, with a maximum file size
   // and maximum height/width.
-  $extension = strtolower(strrchr($file->name, '.'));
-  $size = getimagesize($file->path);
+  $extension = strtolower(strrchr($file->filename, '.'));
+  $size = getimagesize($file->filepath);
   list($maxwidth, $maxheight) = explode('x', variable_get('user_picture_dimensions', '85x85'));
 
   if ((!in_array($size[2], array(1, 2, 3))) || (!in_array($extension, array('.gif', '.jpg', '.png', '.jpeg')))) {
@@ -307,37 +307,13 @@ function user_mail($mail, $subject, $message, $header) {
     */
     return mail(
       $mail,
-      user_mail_encode($subject),
+      mime_header_encode($subject),
       str_replace("\r", '', $message),
       "MIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8; format=flowed\nContent-transfer-encoding: 8Bit\n" . $header
     );
   }
 }
 
-function user_mail_encode($string, $charset = 'UTF-8') {
-  /*
-  ** Used to encodes mail headers that contain non US- ASCII
-  ** characters.
-  ** http://www.rfc-editor.org/rfc/rfc2047.txt
-  **
-  ** Notes:
-  **   - Only encode strings that contain non-ASCII characters.
-  **   - The chunks come in groupings of 4 bytes when using base64
-  **     encoded.
-  **   - trim() is used to ensure that no extra spacing is added by
-  **     chunk_split() or preg_replace().
-  **   - Using \n as the chunk separator may cause problems on some
-  **     systems and may have to be changed to \r\n or \r.
-  */
-  if (!preg_match('/^[\x20-\x7E]*$/', $string)) {
-    $chunk_size = 75 - 7 - strlen($charset);
-    $chunk_size -= $chunk_size % 4;
-    $string = trim(chunk_split(base64_encode($string), $chunk_size, "\n"));
-    $string = trim(preg_replace('/^(.*)$/m', " =?$charset?B?\\1?=", $string));
-  }
-  return $string;
-}
-
 function user_deny($type, $mask) {
   $allow = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = 1 AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask));
   $deny = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = 0 AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask));
@@ -1046,7 +1022,7 @@ function user_edit_validate($uid, &$edit) {
 
   // Validate the e-mail address:
   if ($error = user_validate_mail($edit['mail'])) {
-    form_set_error('mail', ucfirst($error));
+    form_set_error('mail', $error);
   }
   else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
     form_set_error('mail', t('The e-mail address "%s" is already taken.', array('%s' => $edit['mail'])));
@@ -1247,9 +1223,7 @@ function user_configure_settings() {
   $output .= form_group(t('User email settings'), $group);
 
   // Picture settings.
-  if (!file_check_directory(file_create_path(variable_get('user_picture_path', 'pictures')))) {
-    form_set_error('user_picture_path', t('the picture directory does not exist, or is not writable.'));
-  }
+  file_check_directory(file_create_path(variable_get('user_picture_path', 'pictures')), 1, 'user_picture_path');
 
   $group  = form_radios(t('Picture support'), 'user_pictures', variable_get('user_pictures', 0), array(t('Disabled'), t('Enabled')), t('Enable picture support.'));
   $group .= form_textfield(t('Picture image path'), 'user_picture_path', variable_get('user_picture_path', 'pictures'), 45, 255, t('Subdirectory in the directory "%dir" where pictures will be stored.', array('%dir' => variable_get('file_directory_path', 'files') . FILE_SEPARATOR)));
@@ -1351,8 +1325,15 @@ function user_admin_access($edit = array()) {
   return form($output);
 }
 
-function user_roles($membersonly = 0) {
-  $result = db_query('SELECT * FROM {role} ORDER BY name');
+function user_roles($membersonly = 0, $permission = 0) {
+  $roles = array();
+
+  if ($permission) {
+    $result = db_query("SELECT r.* FROM {role} r INNER JOIN {permission} p ON r.rid = p.rid WHERE p.perm LIKE '%%%s%%' ORDER BY r.name", $permission);
+  }
+  else {
+    $result = db_query('SELECT * FROM {role} ORDER BY name');
+  }
   while ($role = db_fetch_object($result)) {
     if (!$membersonly || ($membersonly && $role->name != 'anonymous user')) {
       $roles[$role->rid] = $role->name;

modules/user/user.module

@@ -182,8 +182,8 @@ function user_validate_picture($file, &$edit, $user) {
 
   // Check that uploaded file is an image, with a maximum file size
   // and maximum height/width.
-  $extension = strtolower(strrchr($file->name, '.'));
-  $size = getimagesize($file->path);
+  $extension = strtolower(strrchr($file->filename, '.'));
+  $size = getimagesize($file->filepath);
   list($maxwidth, $maxheight) = explode('x', variable_get('user_picture_dimensions', '85x85'));
 
   if ((!in_array($size[2], array(1, 2, 3))) || (!in_array($extension, array('.gif', '.jpg', '.png', '.jpeg')))) {
@@ -307,37 +307,13 @@ function user_mail($mail, $subject, $message, $header) {
     */
     return mail(
       $mail,
-      user_mail_encode($subject),
+      mime_header_encode($subject),
       str_replace("\r", '', $message),
       "MIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8; format=flowed\nContent-transfer-encoding: 8Bit\n" . $header
     );
   }
 }
 
-function user_mail_encode($string, $charset = 'UTF-8') {
-  /*
-  ** Used to encodes mail headers that contain non US- ASCII
-  ** characters.
-  ** http://www.rfc-editor.org/rfc/rfc2047.txt
-  **
-  ** Notes:
-  **   - Only encode strings that contain non-ASCII characters.
-  **   - The chunks come in groupings of 4 bytes when using base64
-  **     encoded.
-  **   - trim() is used to ensure that no extra spacing is added by
-  **     chunk_split() or preg_replace().
-  **   - Using \n as the chunk separator may cause problems on some
-  **     systems and may have to be changed to \r\n or \r.
-  */
-  if (!preg_match('/^[\x20-\x7E]*$/', $string)) {
-    $chunk_size = 75 - 7 - strlen($charset);
-    $chunk_size -= $chunk_size % 4;
-    $string = trim(chunk_split(base64_encode($string), $chunk_size, "\n"));
-    $string = trim(preg_replace('/^(.*)$/m', " =?$charset?B?\\1?=", $string));
-  }
-  return $string;
-}
-
 function user_deny($type, $mask) {
   $allow = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = 1 AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask));
   $deny = db_fetch_object(db_query("SELECT * FROM {access} WHERE status = 0 AND type = '%s' AND LOWER('%s') LIKE LOWER(mask)", $type, $mask));
@@ -1046,7 +1022,7 @@ function user_edit_validate($uid, &$edit) {
 
   // Validate the e-mail address:
   if ($error = user_validate_mail($edit['mail'])) {
-    form_set_error('mail', ucfirst($error));
+    form_set_error('mail', $error);
   }
   else if (db_num_rows(db_query("SELECT uid FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
     form_set_error('mail', t('The e-mail address "%s" is already taken.', array('%s' => $edit['mail'])));
@@ -1247,9 +1223,7 @@ function user_configure_settings() {
   $output .= form_group(t('User email settings'), $group);
 
   // Picture settings.
-  if (!file_check_directory(file_create_path(variable_get('user_picture_path', 'pictures')))) {
-    form_set_error('user_picture_path', t('the picture directory does not exist, or is not writable.'));
-  }
+  file_check_directory(file_create_path(variable_get('user_picture_path', 'pictures')), 1, 'user_picture_path');
 
   $group  = form_radios(t('Picture support'), 'user_pictures', variable_get('user_pictures', 0), array(t('Disabled'), t('Enabled')), t('Enable picture support.'));
   $group .= form_textfield(t('Picture image path'), 'user_picture_path', variable_get('user_picture_path', 'pictures'), 45, 255, t('Subdirectory in the directory "%dir" where pictures will be stored.', array('%dir' => variable_get('file_directory_path', 'files') . FILE_SEPARATOR)));
@@ -1351,8 +1325,15 @@ function user_admin_access($edit = array()) {
   return form($output);
 }
 
-function user_roles($membersonly = 0) {
-  $result = db_query('SELECT * FROM {role} ORDER BY name');
+function user_roles($membersonly = 0, $permission = 0) {
+  $roles = array();
+
+  if ($permission) {
+    $result = db_query("SELECT r.* FROM {role} r INNER JOIN {permission} p ON r.rid = p.rid WHERE p.perm LIKE '%%%s%%' ORDER BY r.name", $permission);
+  }
+  else {
+    $result = db_query('SELECT * FROM {role} ORDER BY name');
+  }
   while ($role = db_fetch_object($result)) {
     if (!$membersonly || ($membersonly && $role->name != 'anonymous user')) {
       $roles[$role->rid] = $role->name;