strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "roll version - now in alpha 2.1"

Browse source 
This reverts commit df4f77dadd.
This commit is contained in:
Friendika 2011-01-27 03:50:56 -08:00
parent df4f77dadd
commit e8a3166fa9
5 changed files with 75 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
addon/java_upload/java_upload.php
View file

@ -3,47 +3,6 @@
function java_upload_form(&$a,&$b) {
$b .= <<< EOT;
<div id="photos-upload-select-files-text">$filestext</div>
<div id="photos_upload_applet_wrapper">
<applet name="jumpLoaderApplet"
code="jmaster.jumploader.app.JumpLoaderApplet.class"
archive="$archive"
width="700"
height="600"
mayscript >
<param name="uc_uploadUrl" value="$uploadurl" />
<param name="uc_uploadFormName" value="photos-upload-form" />
<param name="gc_loggingLeveL" value="FATAL" />
<param name="uc_fileParameterName" value="userfile" />
<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
<param name="vc_disableLocalFileSystem" value="false" />
<param name="vc_uploadViewMenuBarVisible" value="false" />
<param name="vc_mainViewFileListViewVisible" value="true" />
<param name="vc_mainViewFileListViewHeightPercent" value="50" />
<param name="vc_mainViewFileTreeViewVisible" value="true" />
<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
<param name="vc_lookAndFeel" value="system" />
</applet>
</div>
<div id="photos-upload-no-java-message" >
$nojava
</div>
EOT;
}
function java_upload_photo_post_init(&$a,&$b) { function java_upload_photo_post_init(&$a,&$b) {

115
addon/js_upload/js_upload.php
View file

@ -1,98 +1,20 @@
<?php <?php
/**
*
* JavaScript Photo/Image Uploader
*
* Uses Valum 'qq' Uploader.
* Module Author: Chris Case
*
* Prior to enabling, ensure that you have a directory 'uploads'
* which is writable by the web server.
*
*/
function js_upload_install() { function js_upload_install() {
register_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); register_hooks('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init');
register_hook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); register_hooks('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file');
register_hook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); register_hooks('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end');
register_hook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end');
} }
function js_upload_uninstall() { function js_upload_uninstall() {
unregister_hook('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form'); register_hooks('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init');
unregister_hook('photo_post_init', 'addon/js_upload/js_upload.php', 'js_upload_post_init'); register_hooks('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file');
unregister_hook('photo_post_file', 'addon/js_upload/js_upload.php', 'js_upload_post_file'); register_hooks('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end');
unregister_hook('photo_post_end', 'addon/js_upload/js_upload.php', 'js_upload_post_end');
} }
function js_upload_form(&$a,&$b) {
$b['default_upload'] = false;
$b['addon_text'] .= '<link href="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
$b['addon_text'] .= '<script src="' . $a->get_baseurl() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
$b['addon_text'] .= <<< EOT
<div id="file-uploader-demo1">
<noscript>
<p>Please enable JavaScript to use file uploader.</p>
<!-- or put a simple form for upload here -->
</noscript>
</div>
<script type="text/javascript">
var uploader = null;
function getSelected(opt) {
var selected = new Array();
var index = 0;
for (var intLoop = 0; intLoop < opt.length; intLoop++) {
if ((opt[intLoop].selected) ||
(opt[intLoop].checked)) {
index = selected.length;
//selected[index] = new Object;
selected[index] = opt[intLoop].value;
//selected[index] = intLoop;
}
}
return selected;
}
function createUploader() {
uploader = new qq.FileUploader({
element: document.getElementById('file-uploader-demo1'),
action: '{$b['post_url']}',
debug: true,
onSubmit: function(id,filename) {
uploader.setParams( {
newalbum : document.getElementById('photos-upload-newalbum').value,
album : document.getElementById('photos-upload-album-select').value,
group_allow : getSelected(document.getElementById('group_allow')).join(','),
contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
group_deny : getSelected(document.getElementById('group_deny')).join(','),
contact_deny : getSelected(document.getElementById('contact_deny')).join(',')
});
}
});
}
// in your app create uploader as soon as the DOM is ready
// don't wait for the window to load
window.onload = createUploader;
</script>
EOT;
}
function js_upload_post_init(&$a,&$b) { function js_upload_post_init(&$a,&$b) {
// list of valid extensions, ex. array("jpeg", "xml", "bmp") // list of valid extensions, ex. array("jpeg", "xml", "bmp")
@ -104,10 +26,8 @@ function js_upload_post_init(&$a,&$b) {
$sizeLimit = 6 * 1024 * 1024; $sizeLimit = 6 * 1024 * 1024;
$uploader = new qqFileUploader($allowedExtensions, $sizeLimit); $uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
$result = $uploader->handleUpload('uploads/'); $result = $uploader->handleUpload('uploads/');
// to pass data through iframe you will need to encode all html tags // to pass data through iframe you will need to encode all html tags
$a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES); $a->data['upload_jsonresponse'] = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
@ -116,27 +36,22 @@ function js_upload_post_init(&$a,&$b) {
killme(); 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['filename'] = $result['filename'];
$b['filesize'] = filesize($b['src']); $b['filesize'] = filesize($src);
logger('post_file' . print_r($b, true));
} }
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')) { if(x($a->data,'upload_jsonresponse')) {
echo $a->data['upload_jsonresponse']; echo $a->data['upload_jsonresponse'];
@unlink($src);
killme(); killme();
} }
@ -168,11 +83,9 @@ class qqUploadedFileXhr {
return true; return true;
} }
function getName() { function getName() {
return $_GET['qqfile']; return $_GET['qqfile'];
} }
function getSize() { function getSize() {
if (isset($_SERVER["CONTENT_LENGTH"])){ if (isset($_SERVER["CONTENT_LENGTH"])){
return (int)$_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) * Handle file uploads via regular form post (uses the $_FILES array)
*/ */
class qqUploadedFileForm { class qqUploadedFileForm {
/** /**
* Save the file to the specified path * Save the file to the specified path
@ -204,7 +116,6 @@ class qqUploadedFileForm {
return $_FILES['qqfile']['size']; return $_FILES['qqfile']['size'];
} }
} }
class qqFileUploader { class qqFileUploader {
private $allowedExtensions = array(); private $allowedExtensions = array();
private $sizeLimit = 10485760; private $sizeLimit = 10485760;
@ -253,7 +164,7 @@ class qqFileUploader {
*/ */
function handleUpload($uploadDirectory, $replaceOldFile = FALSE){ function handleUpload($uploadDirectory, $replaceOldFile = FALSE){
if (!is_writable($uploadDirectory)){ 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){ if (!$this->file){
@ -281,7 +192,7 @@ class qqFileUploader {
$pathinfo = pathinfo($this->file->getName()); $pathinfo = pathinfo($this->file->getName());
$filename = $pathinfo['filename']; $filename = $pathinfo['filename'];
//$filename = md5(uniqid());
$ext = $pathinfo['extension']; $ext = $pathinfo['extension'];
if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){ if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){

2
boot.php
View file

@ -3,7 +3,7 @@
set_time_limit(0); set_time_limit(0);
define ( 'BUILD_ID', 1033 ); define ( 'BUILD_ID', 1033 );
define ( 'FRIENDIKA_VERSION', '2.10.0901' ); define ( 'FRIENDIKA_VERSION', '2.01.1006' );
define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' );
define ( 'EOL', "<br />\r\n" ); define ( 'EOL', "<br />\r\n" );

109
mod/photos.php
View file

@ -1,4 +1,5 @@
<?php <?php
require_once('include/Photo.php'); require_once('include/Photo.php');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
@ -48,18 +49,9 @@ function photos_init(&$a) {
function photos_post(&$a) { function photos_post(&$a) {
logger('mod/photos.php: photos_post(): begin' , 'LOGGER_DEBUG');
foreach($_REQUEST AS $key => $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; $can_post = false;
$visitor = 0; $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();
/** if($_POST['partitionCount'])
* Determine the album to use $java_upload = true;
*/ else
$java_upload = false;
$album = notags(trim($_REQUEST['album'])); $album = notags(trim($_POST['album']));
$newalbum = notags(trim($_REQUEST['newalbum'])); $newalbum = notags(trim($_POST['newalbum']));
logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , 'LOGGER_DEBUG');
if(! strlen($album)) { if(! strlen($album)) {
if(strlen($newalbum)) if(strlen($newalbum))
@ -496,16 +486,6 @@ foreach($_FILES AS $key => $val) {
$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); $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", $r = q("SELECT * FROM `photo` WHERE `album` = '%s' AND `uid` = %d",
dbesc($album), dbesc($album),
intval($page_owner_uid) intval($page_owner_uid)
@ -515,25 +495,15 @@ foreach($_FILES AS $key => $val) {
else else
$visible = 0; $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); $src = $_FILES['userfile']['tmp_name'];
logger('after post_file'); $filename = basename($_FILES['userfile']['name']);
if(x($ret,'src') && x($ret,'filesize')) { $filesize = intval($_FILES['userfile']['size']);
$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']);
}
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
@ -543,13 +513,10 @@ logger('after post_file');
return; return;
} }
logger('mod/photos.php: photos_post(): loading the contents of ' . $src , 'LOGGER_DEBUG');
$imagedata = @file_get_contents($src); $imagedata = @file_get_contents($src);
$ph = new Photo($imagedata); $ph = new Photo($imagedata);
if(! $ph->is_valid()) { if(! $ph->is_valid()) {
logger('mod/photos.php: photos_post(): unable to process image' , 'LOGGER_DEBUG');
notice( t('Unable to process image.') . EOL ); notice( t('Unable to process image.') . EOL );
@unlink($src); @unlink($src);
killme(); killme();
@ -557,7 +524,7 @@ logger('after post_file');
@unlink($src); @unlink($src);
$width = $ph->getWidth(); $width = $ph->getWidth();
$height = $ph->getHeight(); $height = $ph->getHeight();
$smallest = 0; $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); $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) { if(! $r) {
logger('mod/photos.php: photos_post(): image store failed' , 'LOGGER_DEBUG');
notice( t('Image upload failed.') . EOL ); notice( t('Image upload failed.') . EOL );
killme(); killme();
} }
@ -589,6 +555,7 @@ logger('after post_file');
// Create item container // Create item container
$arr = array(); $arr = array();
$arr['uid'] = $page_owner_uid; $arr['uid'] = $page_owner_uid;
@ -617,13 +584,14 @@ logger('after post_file');
$item_id = item_store($arr); $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 killme();
// if they do not wish to be redirected 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); $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
$albumselect .= '</select>'; $albumselect .= '</select>';
$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 = '<input type="file" name="userfile" /> <div class="photos-upload-submit-wrapper" >
<input type="submit" name="submit" value="' . t('Submit') . '" id="photos-upload-submit" /> </div>';
$tpl = load_view_file('view/photos_upload.tpl'); $tpl = load_view_file('view/photos_upload.tpl');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$pagename' => t('Upload Photos'), '$pagename' => t('Upload Photos'),
@ -792,16 +744,14 @@ function photos_content(&$a) {
'$nickname' => $a->data['user']['nickname'], '$nickname' => $a->data['user']['nickname'],
'$newalbum' => t('New album name: '), '$newalbum' => t('New album name: '),
'$existalbumtext' => t('or existing album name: '), '$existalbumtext' => t('or existing album name: '),
'$filestext' => t('Select files to upload: '),
'$albumselect' => $albumselect, '$albumselect' => $albumselect,
'$permissions' => t('Permissions'), '$permissions' => t('Permissions'),
'$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)), '$aclselect' => (($visitor) ? '' : populate_acl($a->user, $celeb)),
'$uploader' => $ret['addon_text'],
'$filestext' => t('Select files to upload: '),
'$archive' => $a->get_baseurl() . '/jumploader_z.jar', '$archive' => $a->get_baseurl() . '/jumploader_z.jar',
'$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'), '$nojava' => t('Use the following controls only if the Java uploader [above] fails to launch.'),
'$default' => (($ret['default_upload']) ? $default_upload : ''), '$uploadurl' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
'$uploadurl' => $ret['post_url'] '$submit' => t('Submit')
)); ));
return $o; return $o;
@ -1204,4 +1154,3 @@ function photos_content(&$a) {
$o .= paginate($a); $o .= paginate($a);
return $o; return $o;
} }

35
view/photos_upload.tpl
View file

@ -23,12 +23,41 @@
</div> </div>
<div id="photos_upload_spacer"></div> <div id="photos-upload-select-files-text">$filestext</div>
$uploader <div id="photos_upload_applet_wrapper">
<applet name="jumpLoaderApplet"
code="jmaster.jumploader.app.JumpLoaderApplet.class"
archive="$archive"
width="700"
height="600"
mayscript >
<param name="uc_uploadUrl" value="$uploadurl" />
<param name="uc_uploadFormName" value="photos-upload-form" />
<param name="gc_loggingLeveL" value="FATAL" />
<param name="uc_fileParameterName" value="userfile" />
<param name="uc_cookie" value="PHPSESSID=$sessid; path=/;" />
<param name="vc_disableLocalFileSystem" value="false" />
<param name="vc_uploadViewMenuBarVisible" value="false" />
<param name="vc_mainViewFileListViewVisible" value="true" />
<param name="vc_mainViewFileListViewHeightPercent" value="50" />
<param name="vc_mainViewFileTreeViewVisible" value="true" />
<param name="vc_mainViewFileTreeViewWidthPercent" value="35" />
<param name="vc_lookAndFeel" value="system" />
</applet>
</div>
$default <div id="photos-upload-no-java-message" >
$nojava
</div>
<input type="file" name="userfile" />
<div class="photos-upload-submit-wrapper" >
<input type="submit" name="submit" value="$submit" id="photos-upload-submit" />
</div>
<div class="photos-upload-end" ></div> <div class="photos-upload-end" ></div>
</form> </form>