//$p->toEventString();
}
- function onUploadFromData($filename, $data, $roo)
+ function onUploadFromData($data, $roo)
{
-
-// echo $_FILES['imageUpload']['type'];exit;
- if (empty($_FILES['imageUpload']['tmp_name']) ||
- empty($_FILES['imageUpload']['name']) ||
- empty($_FILES['imageUpload']['type'])
- ) {
+ if (empty($data)) {
$this->err = "Missing file details";
return false;
}
if ($this->id) {
$this->beforeDelete();
}
- if ( empty($this->ontable)) {
+
+ if (empty($this->ontable)) {
$this->err = "Missing ontable";
return false;
}
if (!empty($this->imgtype) && $this->imgtype[0] == '-' && !empty($this->onid)) {
- // then its an upload
$img = DB_DataObject::factory('Images');
$img->onid = $this->onid;
$img->ontable = $this->ontable;
$img->beforeDelete();
$img->delete();
}
-
}
-
-
require_once 'File/MimeType.php';
$y = new File_MimeType();
- $this->mimetype = $_FILES['imageUpload']['type'];
+
if (in_array($this->mimetype, array(
'text/application',
'application/octet-stream',
'application/vnd.ms-excel', /// sometimes windows reports csv as excel???
'application/csv-tab-delimited-table', // windows again!!?
))) { // weird tyeps..
- $inf = pathinfo($_FILES['imageUpload']['name']);
+ $inf = pathinfo($this->filename);
$this->mimetype = $y->fromExt($inf['extension']);
}
-
$ext = $y->toExt(trim((string) $this->mimetype ));
$this->filename = empty($this->filename) ?
- $_FILES['imageUpload']['name'] : ($this->filename .'.'. $ext);
-
-
+ ('gen-' . date('Y-m-d H:i:s') . '.' . $ext) : ($this->filename .'.'. $ext);
- if (!$this->createFrom($_FILES['imageUpload']['tmp_name'])) {
+ if (!$this->createFromData($data)) {
return false;
}
return true;
}
- function createFromData($file, $filename=false)
- {
- // copy the file into the storage area..
- if (!file_exists($file) || !filesize($file)) {
- return false;
- }
-
- $filename = empty($filename) ? $file : $filename;
-
- if (empty($this->mimetype)) {
- require_once 'File/MimeType.php';
- $y = new File_MimeType();
- $this->mimetype = $y->fromFilename($filename);
- }
+ function createFromData($data)
+ {
$this->mimetype= strtolower($this->mimetype);
$imgs = @getimagesize($file);
- if (empty($imgs) || empty($imgs[0]) || empty($imgs[1])) {
- // it's a file!!!!
- } else {
+ if (!empty($imgs) && !empty($imgs[0]) && !empty($imgs[1])) {
list($this->width , $this->height) = $imgs;
}
}
- $this->filesize = filesize($file);
+// $this->filesize = filesize($file);
$this->created = date('Y-m-d H:i:s');