Lots of tiny message changes.

[quix0rs-gnu-social.git] / lib / mediafile.php

diff --git a/lib/mediafile.php b/lib/mediafile.php
index 40f37ba61ac0a746d6f331e22a9973a47cab6b38..e3d5b1dbcc40a1a7cbf58af5d4c316ff221f5af9 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * StatusNet, the distributed open-source mMediaFileicroblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
- * Abstraction for a media files in general
+ * Abstraction for media files in general
+ *
+ * TODO: combine with ImageFile?
  *
  * PHP version 5
  *
@@ -21,6 +23,7 @@
  *
  * @category  Media
  * @package   StatusNet
+ * @author    Robin Millette <robin@millette.info>
  * @author    Zach Copley <zach@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
@@ -149,6 +152,9 @@ class MediaFile
             throw new ClientException(_('The uploaded file was only' .
                 ' partially uploaded.'));
             return;
+        case UPLOAD_ERR_NO_FILE:
+            // No file; probably just a non-AJAX submission.
+            return;
         case UPLOAD_ERR_NO_TMP_DIR:
             throw new ClientException(_('Missing a temporary folder.'));
             return;
@@ -159,6 +165,8 @@ class MediaFile
             throw new ClientException(_('File upload stopped by extension.'));
             return;
         default:
+            common_log(LOG_ERR, __METHOD__ . ": Unknown upload error " .
+                $_FILES[$param]['error']);
             throw new ClientException(_('System error uploading file.'));
             return;
         }
@@ -168,7 +176,7 @@ class MediaFile
             // Should never actually get here
 
             @unlink($_FILES[$param]['tmp_name']);
-            throw new ClientException(_('File exceeds user\'s quota!'));
+            throw new ClientException(_('File exceeds user\'s quota.'));
             return;
         }
 
@@ -190,7 +198,7 @@ class MediaFile
             }
 
         } else {
-            throw new ClientException(_('Could not determine file\'s mime-type!'));
+            throw new ClientException(_('Could not determine file\'s MIME type.'));
             return;
         }
 
@@ -205,7 +213,7 @@ class MediaFile
 
             // Should never actually get here
 
-            throw new ClientException(_('File exceeds user\'s quota!'));
+            throw new ClientException(_('File exceeds user\'s quota.'));
             return;
         }
 
@@ -226,7 +234,7 @@ class MediaFile
                     $stream['uri'] . ' ' . $filepath));
             }
         } else {
-            throw new ClientException(_('Could not determine file\'s mime-type!'));
+            throw new ClientException(_('Could not determine file\'s MIME type.'));
             return;
         }
 
@@ -264,7 +272,7 @@ class MediaFile
             $hint = '';
         }
         throw new ClientException(sprintf(
-            _('%s is not a supported filetype on this server.'), $filetype) . $hint);
+            _('%s is not a supported file type on this server.'), $filetype) . $hint);
     }
 
     static function respectsQuota($user, $filesize)
@@ -278,4 +286,4 @@ class MediaFile
         }
     }
 
-}
\ No newline at end of file
+}