X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fnewmail%2Floadfile.php;h=2ed720d9a19d71cbef523de69c479bff6de8132f;hp=8a32ab13929aa8632635022b5b4c1065c940a991;hb=de3178dc1a5117827e254544c6f164dba653ad83;hpb=fb88325503a9c0c1169966960b0a2f0e4883dc30

diff --git a/plugins/newmail/loadfile.php b/plugins/newmail/loadfile.php
index 8a32ab13..2ed720d9 100644
--- a/plugins/newmail/loadfile.php
+++ b/plugins/newmail/loadfile.php
@@ -1,21 +1,22 @@
 <?php
+
 /**
  * SquirrelMail NewMail plugin
  *
  * Script loads user's media file.
+ *
+ * @copyright &copy; 2001-2009 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage newmail
  */
 
 /**
- * define SM_PATH 
+ * Path for SquirrelMail required files.
  * @ignore
  */
-define('SM_PATH','../../');
-
-/** Load squirrelmail functions */
-include_once(SM_PATH . 'include/validate.php');
+require('../../include/init.php');
 /** Load plugin functions */
 include_once(SM_PATH . 'plugins/newmail/functions.php');
 
@@ -25,10 +26,10 @@ global $data_dir;
 $media = getPref($data_dir,$username,'newmail_media', '(none)');
 // get other prefs
 $newmail_userfile_type=getPref($data_dir,$username,'newmail_userfile_type',false);
-    
+
 $newmail_userfile_location=getHashedFile($username, $data_dir, $username . '.sound');
 
-if ($newmail_userfile_type!=false && file_exists($newmail_userfile_location)) {
+if ($newmail_uploadsounds && $newmail_userfile_type!=false && file_exists($newmail_userfile_location)) {
     // open media file
     $newmail_userfile_handle = fopen($newmail_userfile_location,'rb');
     if ($newmail_userfile_handle) {
@@ -79,4 +80,3 @@ if ($newmail_userfile_type!=false && file_exists($newmail_userfile_location)) {
     } // failed to open userfile
 } // userfile is missing or preferences don't store file type.
 // maybe we should send some error code
-?>
\ No newline at end of file