diff --git a/addon/java_upload/java_upload.php b/addon/java_upload/java_upload.php index 3d627b08f..92cd5326e 100644 --- a/addon/java_upload/java_upload.php +++ b/addon/java_upload/java_upload.php @@ -3,47 +3,6 @@ -function java_upload_form(&$a,&$b) { - - -$b .= <<< EOT; - -
$filestext
- -
- - - - - - - - - - - - - - - - -
- -
- $nojava -
- -EOT; - -} - - - function java_upload_photo_post_init(&$a,&$b) { diff --git a/addon/js_upload/js_upload.php b/addon/js_upload/js_upload.php index b738ade24..143f9ba33 100644 --- a/addon/js_upload/js_upload.php +++ b/addon/js_upload/js_upload.php @@ -1,98 +1,20 @@ get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">'; - $b['addon_text'] .= ''; - - $b['addon_text'] .= <<< EOT - -
- -
- - - -EOT; - - -} - function js_upload_post_init(&$a,&$b) { // list of valid extensions, ex. array("jpeg", "xml", "bmp") @@ -104,10 +26,8 @@ function js_upload_post_init(&$a,&$b) { $sizeLimit = 6 * 1024 * 1024; $uploader = new qqFileUploader($allowedExtensions, $sizeLimit); - $result = $uploader->handleUpload('uploads/'); - // to pass data through iframe you will need to encode all html tags $a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES); @@ -116,27 +36,22 @@ function js_upload_post_init(&$a,&$b) { killme(); } - $a->data['upload_result'] = $result; } -function js_upload_post_file(&$a,&$b) { +function js_upload_photo_post_file(&$a,&$b) { - $result = $a->data['upload_result']; - - $b['src'] = 'uploads/' . $result['filename']; + $b['src'] = 'uploads/'.$result['filename']; $b['filename'] = $result['filename']; - $b['filesize'] = filesize($b['src']); - -logger('post_file' . print_r($b, true)); + $b['filesize'] = filesize($src); } -function js_upload_post_end(&$a,&$b) { +function js_upload_photo_post_end(&$a,&$b) { -logger('upload_post_end'); if(x($a->data,'upload_jsonresponse')) { echo $a->data['upload_jsonresponse']; + @unlink($src); killme(); } @@ -168,11 +83,9 @@ class qqUploadedFileXhr { return true; } - function getName() { return $_GET['qqfile']; } - function getSize() { if (isset($_SERVER["CONTENT_LENGTH"])){ return (int)$_SERVER["CONTENT_LENGTH"]; @@ -185,7 +98,6 @@ class qqUploadedFileXhr { /** * Handle file uploads via regular form post (uses the $_FILES array) */ - class qqUploadedFileForm { /** * Save the file to the specified path @@ -204,7 +116,6 @@ class qqUploadedFileForm { return $_FILES['qqfile']['size']; } } - class qqFileUploader { private $allowedExtensions = array(); private $sizeLimit = 10485760; @@ -253,7 +164,7 @@ class qqFileUploader { */ function handleUpload($uploadDirectory, $replaceOldFile = FALSE){ if (!is_writable($uploadDirectory)){ - return array('error' => t('Server error. Upload directory isn\'t writable.')); + return array('error' => t('Server error. Upload directory isn't writable.')); } if (!$this->file){ @@ -281,7 +192,7 @@ class qqFileUploader { $pathinfo = pathinfo($this->file->getName()); $filename = $pathinfo['filename']; - + //$filename = md5(uniqid()); $ext = $pathinfo['extension']; if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){ diff --git a/boot.php b/boot.php index 36530736d..adb1b96f8 100644 --- a/boot.php +++ b/boot.php @@ -3,7 +3,7 @@ set_time_limit(0); define ( 'BUILD_ID', 1033 ); -define ( 'FRIENDIKA_VERSION', '2.10.0901' ); +define ( 'FRIENDIKA_VERSION', '2.01.1006' ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); define ( 'EOL', "
\r\n" ); diff --git a/mod/photos.php b/mod/photos.php index ecf5031b3..e811ca395 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1,4 +1,5 @@ $val) { - logger('mod/photos.php: photos_post(): $_REQUEST key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); -} - -foreach($_FILES AS $key => $val) { - logger('mod/photos.php: photos_post(): $_FILES key: ' . $key . ' val: ' . $val , 'LOGGER_DEBUG'); -} - $can_post = false; $visitor = 0; @@ -474,20 +466,18 @@ foreach($_FILES AS $key => $val) { } - /** - * default post action - upload a photo - */ + // default post action - upload a photo - call_hooks('photo_post_init', $_POST); + if(! x($_FILES,'userfile')) + killme(); - /** - * Determine the album to use - */ + if($_POST['partitionCount']) + $java_upload = true; + else + $java_upload = false; - $album = notags(trim($_REQUEST['album'])); - $newalbum = notags(trim($_REQUEST['newalbum'])); - - logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG'); + $album = notags(trim($_POST['album'])); + $newalbum = notags(trim($_POST['newalbum'])); if(! strlen($album)) { if(strlen($newalbum)) @@ -496,16 +486,6 @@ foreach($_FILES AS $key => $val) { $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); } - /** - * - * We create a wall item for every photo, but we don't want to - * overwhelm the data stream with a hundred newly uploaded photos. - * So we will make one photo (the first one uploaded to this album) - * visible by default, the rest will become visible over time when and if - * they acquire comments, likes, dislikes, and/or tags - * - */ - $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d", dbesc($album), intval($page_owner_uid) @@ -515,25 +495,15 @@ foreach($_FILES AS $key => $val) { else $visible = 0; - $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow']))); - $str_contact_allow = perms2str(((is_array($_REQUEST['contact_allow'])) ? $_REQUEST['contact_allow'] : explode(',',$_REQUEST['contact_allow']))); - $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny']))); - $str_contact_deny = perms2str(((is_array($_REQUEST['contact_deny'])) ? $_REQUEST['contact_deny'] : explode(',',$_REQUEST['contact_deny']))); - $ret = array('src' => '', 'filename' => '', 'filesize' => 0); + $str_group_allow = perms2str($_POST['group_allow']); + $str_contact_allow = perms2str($_POST['contact_allow']); + $str_group_deny = perms2str($_POST['group_deny']); + $str_contact_deny = perms2str($_POST['contact_deny']); - call_hooks('photo_post_file',$ret); -logger('after post_file'); - if(x($ret,'src') && x($ret,'filesize')) { - $src = $ret['src']; - $filename = $ret['filename']; - $filesize = $ret['filesize']; - } - else { - $src = $_FILES['userfile']['tmp_name']; - $filename = basename($_FILES['userfile']['name']); - $filesize = intval($_FILES['userfile']['size']); - } + $src = $_FILES['userfile']['tmp_name']; + $filename = basename($_FILES['userfile']['name']); + $filesize = intval($_FILES['userfile']['size']); $maximagesize = get_config('system','maximagesize'); @@ -543,13 +513,10 @@ logger('after post_file'); return; } - logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG'); - $imagedata = @file_get_contents($src); $ph = new Photo($imagedata); if(! $ph->is_valid()) { - logger('mod/photos.php: photos_post(): unable to process image' , 'LOGGER_DEBUG'); notice( t('Unable to process image.') . EOL ); @unlink($src); killme(); @@ -557,7 +524,7 @@ logger('after post_file'); @unlink($src); - $width = $ph->getWidth(); + $width = $ph->getWidth(); $height = $ph->getHeight(); $smallest = 0; @@ -567,7 +534,6 @@ logger('after post_file'); $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); if(! $r) { - logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG'); notice( t('Image upload failed.') . EOL ); killme(); } @@ -589,6 +555,7 @@ logger('after post_file'); // Create item container + $arr = array(); $arr['uid'] = $page_owner_uid; @@ -617,13 +584,14 @@ logger('after post_file'); $item_id = item_store($arr); - call_hooks('photo_post_end',intval($item_id)); + if(! $java_upload) { + goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); + return; // NOTREACHED + } - // addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook - // if they do not wish to be redirected + killme(); + return; // NOTREACHED - goaway($a->get_baseurl() . '/' . $_SESSION['photo_return']); - // NOTREACHED } @@ -769,22 +737,6 @@ function photos_content(&$a) { $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); $albumselect .= ''; - - $uploader = ''; - - $ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'], - 'addon_text' => $uploader, - 'default_upload' => true); - - - call_hooks('photo_upload_form',$ret); - - $default_upload = '
-
'; - - - - $tpl = load_view_file('view/photos_upload.tpl'); $o .= replace_macros($tpl,array( '$pagename' => t('Upload Photos'), @@ -792,16 +744,14 @@ function photos_content(&$a) { '$nickname' => $a->data['user']['nickname'], '$newalbum' => t('New album name: '), '$existalbumtext' => t('or existing album name: '), + '$filestext' => t('Select files to upload: '), '$albumselect' => $albumselect, '$permissions' => t('Permissions'), '$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)), - '$uploader' => $ret['addon_text'], - '$filestext' => t('Select files to upload: '), '$archive' => $a->get_baseurl() . '/jumploader_z.jar', '$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'), - '$default' => (($ret['default_upload']) ? $default_upload : ''), - '$uploadurl' => $ret['post_url'] - + '$uploadurl' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'], + '$submit' => t('Submit') )); return $o; @@ -1204,4 +1154,3 @@ function photos_content(&$a) { $o .= paginate($a); return $o; } - diff --git a/view/photos_upload.tpl b/view/photos_upload.tpl index 490d4f220..8a9dc3c68 100644 --- a/view/photos_upload.tpl +++ b/view/photos_upload.tpl @@ -23,12 +23,41 @@ -
+
$filestext
- $uploader +
+ + + + + + + + + + + + + + + + +
- $default +
+ $nojava +
+ + +
+ +