2 files changed, 56 insertions, 0 deletions
diff --git a/modules/gallery/helpers/legal_file.php b/modules/gallery/helpers/legal_file.php
new file mode 100644
index 00000000..68403fa6
--- /dev/null
+++ b/modules/gallery/helpers/legal_file.php
@@ -0,0 +1,39 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2011 Chad Parry
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class legal_file_Core {
+  static function get_extensions() {
+    // Create a default list of allowed extensions and then let modules modify it.
+    $extensions_wrapper = new stdClass();
+    $extensions_wrapper->extensions = array("gif", "jpg", "jpeg", "png");
+    if (movie::find_ffmpeg()) {
+      array_push($extensions_wrapper->extensions, "flv", "mp4", "m4v");
+    }
+    module::event("legal_file_extensions", $extensions_wrapper);
+    return $extensions_wrapper->extensions;
+  }
+
+  static function get_filters() {
+    $filters = array();
+    foreach (legal_file::get_extensions() as $extension) {
+      array_push($filters, "*." . $extension, "*." . strtoupper($extension));
+    }
+    return $filters;
+  }
+}
diff --git a/modules/gallery/helpers/system.php b/modules/gallery/helpers/system.php
index 4110b4ed..d2e9c125 100644
--- a/modules/gallery/helpers/system.php
+++ b/modules/gallery/helpers/system.php
@@ -47,6 +47,22 @@ class system_Core {
    * It allows the caller to specify a prefix and an extension.
    * It always places the file in TMPPATH.
    */
+<<<<<<< HEAD
+  static function temp_filename($prefix = "", $extension = "") {
+    return self::_tempnam(TMPPATH, $prefix, ".$extension", "tempnam");
+  }
+
+  /**
+   * This helper provides a dependency-injected implementation of tempnam.
+   */
+  static function _tempnam($dir, $prefix, $postfix, $builtin) {
+    do {
+      $basename = call_user_func($builtin, $dir, $prefix);
+      if (!$basename) {
+        return false;
+      }
+      $filename = $basename . $postfix;
+=======
   static function temp_filename($prefix="", $extension="") {
     do {
       $basename = tempnam(TMPPATH, $prefix);
@@ -54,6 +70,7 @@ class system_Core {
         return false;
       }
       $filename = "$basename.$extension";
+>>>>>>> db734130c5fe10408040b2326b28b102f3131271
       $success = !file_exists($filename) && @rename($basename, $filename);
       if (!$success) {
         @unlink($basename);