aboutsummaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
Diffstat (limited to 'addon')
-rw-r--r--addon/java_upload/java_upload.php33
-rw-r--r--addon/java_upload/jumploader_z.jarbin0 -> 962772 bytes
-rw-r--r--addon/js_upload/js_upload.php69
3 files changed, 70 insertions, 32 deletions
diff --git a/addon/java_upload/java_upload.php b/addon/java_upload/java_upload.php
index 3d627b08f..8b8a57604 100644
--- a/addon/java_upload/java_upload.php
+++ b/addon/java_upload/java_upload.php
@@ -1,12 +1,43 @@
<?php
+/**
+ *
+ * Java photo uploader, uses Jumploader
+ *
+ * WARNING: This module currently has privacy issues.
+ * The java package does not pass the permissions array intact and could lead to
+ * photos being seen by people that were excluded from seeing them.
+ *
+ */
+
+
+function java_upload_install() {
+ register_hook('photo_upload_form', 'addon/java_upload/java_upload.php', 'java_upload_form');
+ register_hook('photo_post_init', 'addon/java_upload/java_upload.php', 'java_upload_post_init');
+ register_hook('photo_post_end', 'addon/java_upload/java_upload.php', 'java_upload_post_end');
+}
+
+function java_upload_uninstall() {
+ unregister_hook('photo_upload_form', 'addon/java_upload/java_upload.php', 'java_upload_form');
+ unregister_hook('photo_post_init', 'addon/java_upload/java_upload.php', 'java_upload_post_init');
+ unregister_hook('photo_post_end', 'addon/java_upload/java_upload.php', 'java_upload_post_end');
+}
function java_upload_form(&$a,&$b) {
+ $uploadurl = $b['post_url'];
+ $sessid = session_id();
+ $archive = $a->get_baseurl() . '/addon/java_upload/jumploader_z.jar';
+ $filestext = t('Select files to upload: ');
+
+ $nojava = t('Use the following controls only if the Java uploader [above] fails to launch.');
+
+ $b['default_upload'] = true;
+
-$b .= <<< EOT;
+$b['addon_text'] .= <<< EOT
<div id="photos-upload-select-files-text">$filestext</div>
diff --git a/addon/java_upload/jumploader_z.jar b/addon/java_upload/jumploader_z.jar
new file mode 100644
index 000000000..30a85a33f
--- /dev/null
+++ b/addon/java_upload/jumploader_z.jar
Binary files differ
diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php
index b738ade24..dc2dc37dc 100644
--- a/addon/js_upload/js_upload.php
+++ b/addon/js_upload/js_upload.php
@@ -105,7 +105,7 @@ function js_upload_post_init(&$a,&$b) {
$uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
- $result = $uploader->handleUpload('uploads/');
+ $result = $uploader->handleUpload();
// to pass data through iframe you will need to encode all html tags
@@ -124,11 +124,10 @@ function js_upload_post_file(&$a,&$b) {
$result = $a->data['upload_result'];
- $b['src'] = 'uploads/' . $result['filename'];
+ $b['src'] = $result['path'];
$b['filename'] = $result['filename'];
$b['filesize'] = filesize($b['src']);
-logger('post_file' . print_r($b, true));
}
@@ -147,28 +146,32 @@ logger('upload_post_end');
* Handle file uploads via XMLHttpRequest
*/
class qqUploadedFileXhr {
+
+ private $pathnm = '';
+
/**
- * Save the file to the specified path
+ * Save the file in the temp dir.
* @return boolean TRUE on success
*/
- function save($path) {
+ function save() {
$input = fopen("php://input", "r");
- $temp = tmpfile();
+ $this->pathnm = tempnam(sys_get_temp_dir(),'frn');
+ $temp = fopen($this->pathnm,"w");
$realSize = stream_copy_to_stream($input, $temp);
+
fclose($input);
+ fclose($temp);
if ($realSize != $this->getSize()){
return false;
}
-
- $target = fopen($path, "w");
- fseek($temp, 0, SEEK_SET);
- stream_copy_to_stream($temp, $target);
- fclose($target);
-
return true;
}
+ function getPath() {
+ return $this->pathnm;
+ }
+
function getName() {
return $_GET['qqfile'];
}
@@ -187,16 +190,22 @@ class qqUploadedFileXhr {
*/
class qqUploadedFileForm {
+
+
/**
* Save the file to the specified path
* @return boolean TRUE on success
*/
- function save($path) {
- if(!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)){
- return false;
- }
+
+
+ function save() {
return true;
}
+
+ function getPath() {
+ return $_FILES['qqfile']['tmp_name'];
+ }
+
function getName() {
return $_FILES['qqfile']['name'];
}
@@ -225,6 +234,7 @@ class qqFileUploader {
} else {
$this->file = false;
}
+
}
private function checkServerSettings(){
@@ -251,10 +261,7 @@ class qqFileUploader {
/**
* Returns array('success'=>true) or array('error'=>'error message')
*/
- function handleUpload($uploadDirectory, $replaceOldFile = FALSE){
- if (!is_writable($uploadDirectory)){
- return array('error' => t('Server error. Upload directory isn\'t writable.'));
- }
+ function handleUpload(){
if (!$this->file){
return array('error' => t('No files were uploaded.'));
@@ -289,18 +296,18 @@ class qqFileUploader {
return array('error' => t('File has an invalid extension, it should be one of ') . $these . '.');
}
- if(!$replaceOldFile){
- /// don't overwrite previous files that were uploaded
- while (file_exists($uploadDirectory . $filename . '.' . $ext)) {
- $filename .= rand(10, 99);
- }
- }
-
- if ($this->file->save($uploadDirectory . $filename . '.' . $ext)){
- return array('success'=>true,'filename' => $filename . '.' . $ext);
+ if ($this->file->save()){
+ return array(
+ 'success'=>true,
+ 'path' => $this->file->getPath(),
+ 'filename' => $filename . '.' . $ext
+ );
} else {
- return array('error'=> t('Could not save uploaded file.') .
- t('The upload was cancelled, or server error encountered'),'filename' => $filename . '.' . $ext);
+ return array(
+ 'error'=> t('Upload was cancelled, or server error encountered'),
+ 'path' => $this->file->getPath(),
+ 'filename' => $filename . '.' . $ext
+ );
}
}