Release plat/al core v1.1.13

[platal.git] / classes / plupload.php

diff --git a/classes/plupload.php b/classes/plupload.php
index 7184bbd..e903e92 100644 (file)
--- a/classes/plupload.php
+++ b/classes/plupload.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,7 +23,7 @@
  */
 class PlUpload
 {
-    private $forlife;
+    private $hruid;
     private $category;
     private $file_id;
 
@@ -37,11 +37,11 @@ class PlUpload
     private $x;
     private $y;
 
-    public function __construct($forlife, $category, $filename = null)
+    public function __construct($hruid, $category, $filename = null)
     {
         $this->file_id  = $filename;
         $this->category = $category;
-        $this->forlife  = $forlife;
+        $this->hruid    = $hruid;
         $this->filename = $this->makeFilename($this->file_id);
         $this->checkContentType();
     }
@@ -49,13 +49,13 @@ class PlUpload
     private function makeFilename($file_id)
     {
         global $globals;
-        $filename = $globals->spoolroot . '/spool/uploads/temp/';
+        $filename = $globals->spoolroot . '/spool/tmp/';
         if (!file_exists($filename)) {
             if (!mkdir($filename)) {
                 trigger_error('can\'t create upload directory: ' . $filename, E_USER_ERROR);
             }
         }
-        $filename .= $this->forlife . '--' . $this->category;
+        $filename .= $this->hruid . '--' . $this->category;
         if ($file_id) {
             $filename .= '--' . $file_id;
         }
@@ -113,7 +113,11 @@ class PlUpload
             trigger_error('malformed URL given', E_USER_NOTICE);
             return false;
         }
-        $data = file_get_contents($url);
+        if (file_exists($url)) {
+            $data = file_get_contents($url);
+        } else {
+            return false;
+        }
         if (!$data) {
             return false;
         }
@@ -124,9 +128,9 @@ class PlUpload
         return true;
     }
 
-    static public function &get(array &$file, $forlife, $category, $uniq = false)
+    static public function &get(array &$file, $hruid, $category, $uniq = false)
     {
-        $upload = new PlUpload($forlife, $category, $uniq ? null : $file['name']);
+        $upload = new PlUpload($hruid, $category, $uniq ? null : $file['name']);
         if (!$upload->upload($file)) {
             $upload = null;
         }
@@ -159,11 +163,11 @@ class PlUpload
         return file_exists($this->filename);
     }
 
-    static public function listRawFiles($forlife = '*', $category = '*', $uniq = false, $basename = false)
+    static public function listRawFiles($hruid = '*', $category = '*', $uniq = false, $basename = false)
     {
         global $globals;
-        $filename = $globals->spoolroot . '/spool/uploads/temp/';
-        $filename .= $forlife . '--' . $category;
+        $filename = $globals->spoolroot . '/spool/tmp/';
+        $filename .= $hruid . '--' . $category;
         if (!$uniq) {
             $filename .= '--*';
         }
@@ -174,23 +178,23 @@ class PlUpload
         return $files;
     }
 
-    static public function listFilenames($forlife = '*', $category = '*')
+    static public function listFilenames($hruid = '*', $category = '*')
     {
-        $files = PlUpload::listRawFiles($forlife, $category, false, true);
+        $files = PlUpload::listRawFiles($hruid, $category, false, true);
         foreach ($files as &$name) {
-            list($forlife, $cat, $fn) = explode('--', $name, 3);
+            list($hruid, $cat, $fn) = explode('--', $name, 3);
             $name = $fn;
         }
         return $files;
     }
 
-    static public function &listFiles($forlife = '*', $category = '*', $uniq = false)
+    static public function &listFiles($hruid = '*', $category = '*', $uniq = false)
     {
         $res   = array();
-        $files = PlUpload::listRawFiles($forlife, $category, $uniq, true);
+        $files = PlUpload::listRawFiles($hruid, $category, $uniq, true);
         foreach ($files as $name) {
-            list($forlife, $cat, $fn) = explode('--', $name, 3);
-            $res[$fn] = new PlUpload($forlife, $cat, $fn);
+            list($hruid, $cat, $fn) = explode('--', $name, 3);
+            $res[$fn] = new PlUpload($hruid, $cat, $fn);
         }
         return $res;
     }
@@ -312,5 +316,5 @@ class PlUpload
         return null;
     }
 }
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>