upload.php cleanup: really don't make dot files

[wfpl.git] / upload.php

diff --git a/upload.php b/upload.php
index e9ff5db..2509a6b 100644 (file)
--- a/upload.php
+++ b/upload.php
@@ -1,19 +1,9 @@
 <?php
 
-#  Copyright (C) 2007 Jason Woofenden
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#  
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#  
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 # This file contains functions to accept files being uplodad with the <input
@@ -113,11 +103,17 @@ function generate_filename($path, $mime = 'text/plain') {
        # replace symbols with underscores
        $filename = preg_replace('|[^a-z0-9_.]|', '_', $filename);
 
+       # limit length
+       if(strlen($filename > 80)) {
+               $filename = substr($filename, -80);
+       }
+
        # remove dots from the beginning (no invisible files)
        $filename = preg_replace('|^\.*|', '', $filename);
 
-       if(strlen($filename > 80)) {
-               $filename = substr($filename, -80);
+       # make sure there's something before the extension
+       if ($filename == '') {
+               return '_';
        }
 
        # fix extension
@@ -137,6 +133,7 @@ function generate_filename($path, $mime = 'text/plain') {
                }
                $filename = $basename . '.' . $ext;
        }
+
        return $filename;
 }