Rearanged a couple things & removed debugging statements

1 files changed, 7 insertions, 50 deletions

diff --git a/lib/mediafile.php b/lib/mediafile.php
index 4aa8211c3..40f37ba61 100644
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -47,39 +47,21 @@ class MediaFile
             $this->user = common_current_user();
         }
 
-        common_debug('in MediaFile constructor');
-
-        $this->filename = $filename;
-        $this->mimetype = $mimetype;
-
-        common_debug('storing file');
+        $this->filename   = $filename;
+        $this->mimetype   = $mimetype;
         $this->fileRecord = $this->storeFile();
-        common_debug('finished storing file');
 
         $this->fileurl = common_local_url('attachment',
                                     array('attachment' => $this->fileRecord->id));
 
-        common_debug('$this->fileurl() = ' . $this->fileurl);
-
-        // not sure this is necessary -- Zach
         $this->maybeAddRedir($this->fileRecord->id, $this->fileurl);
-
-        common_debug('shortening file url');
         $this->short_fileurl = common_shorten_url($this->fileurl);
-        common_debug('shortened file url =  ' . $short_fileurl);
-
-        // Also, not sure this is necessary -- Zach
         $this->maybeAddRedir($this->fileRecord->id, $this->short_fileurl);
-
-        common_debug("MediaFile: end of constructor");
     }
 
     function attachToNotice($notice)
     {
-        common_debug('MediaFile::attachToNotice() -- doing File_to_post');
         File_to_post::processNew($this->fileRecord->id, $notice->id);
-        common_debug('MediaFile done doing File_to_post');
-
         $this->maybeAddRedir($this->fileRecord->id,
                              common_local_url('file', array('notice' => $notice->id)));
     }
@@ -98,31 +80,21 @@ class MediaFile
     function storeFile() {
 
         $file = new File;
-        $file->filename = $this->filename;
-
-        common_debug('storing ' . $this->filename);
-
-        $file->url = File::url($this->filename);
-        common_debug('file->url = ' . $file->url);
-
-        $filepath = File::path($this->filename);
-        common_debug('filepath = ' . $filepath);
 
-        $file->size = filesize($filepath);
-        $file->date = time();
+        $file->filename = $this->filename;
+        $file->url      = File::url($this->filename);
+        $filepath       = File::path($this->filename);
+        $file->size     = filesize($filepath);
+        $file->date     = time();
         $file->mimetype = $this->mimetype;
 
         $file_id = $file->insert();
 
         if (!$file_id) {
-
-            common_debug("storeFile: problem inserting new file");
             common_log_db_error($file, "INSERT", __FILE__);
             throw new ClientException(_('There was a database error while saving your file. Please try again.'));
         }
 
-        common_debug('finished storing file');
-
         return $file;
     }
 
@@ -133,15 +105,10 @@ class MediaFile
 
     function maybeAddRedir($file_id, $url)
     {
-
-        common_debug("maybeAddRedir: looking up url: $url for file id $file_id");
-
         $file_redir = File_redirection::staticGet('url', $url);
 
         if (empty($file_redir)) {
 
-            common_debug("maybeAddRedir: $url is not in the db");
-
             $file_redir = new File_redirection;
             $file_redir->url = $url;
             $file_redir->file_id = $file_id;
@@ -152,22 +119,16 @@ class MediaFile
                 common_log_db_error($file_redir, "INSERT", __FILE__);
                 throw new ClientException(_('There was a database error while saving your file. Please try again.'));
             }
-        } else {
-
-            common_debug("maybeAddRedir: no need to add $url, it's already in the db");
         }
     }
 
     static function fromUpload($param = 'media', $user = null)
     {
-        common_debug("fromUpload: param = $param");
-
         if (empty($user)) {
             $user = common_current_user();
         }
 
         if (!isset($_FILES[$param]['error'])){
-            common_debug('no file found');
             return;
         }
 
@@ -221,8 +182,6 @@ class MediaFile
             $filename = File::filename($user->getProfile(), $basename, $mimetype);
             $filepath = File::path($filename);
 
-            common_debug("filepath = " . $filepath);
-
             $result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath);
 
             if (!$result) {
@@ -277,8 +236,6 @@ class MediaFile
     static function getUploadedFileType($f) {
         require_once 'MIME/Type.php';
 
-        common_debug("in getUploadedFileType");
-
         $cmd = &PEAR::getStaticProperty('MIME_Type', 'fileCmd');
         $cmd = common_config('attachments', 'filecommand');