+++ /dev/null
-<?php
-/**
- * Elgg single upload action for flash/ajax uploaders
- *
- */
-
-include_once dirname(dirname(__FILE__)) . "/lib/upload.php";
-
-$album_guid = (int) get_input('album_guid');
-$file_var_name = get_input('file_var_name', 'Image');
-
-$album = get_entity($album_guid);
-if (!$album) {
- exit;
-}
-
-// probably POST limit exceeded
-if (empty($_FILES)) {
- echo 'Image was too large';
- exit;
-}
-
-$image_lib = get_plugin_setting('image_lib', 'tidypics');
-if (!$image_lib) {
- $image_lib = "GD";
-}
-
-$temp_file = $_FILES['Image']['tmp_name'];
-$name = $_FILES['Image']['name'];
-$file_size = $_FILES['Image']['size'];
-
-$mime = tp_upload_get_mimetype($name);
-if ($mime == 'unknown') {
- echo 'Not an image';
- exit;
-}
-
-$image = new TidypicsImage();
-$image->container_guid = $album_guid;
-$image->setMimeType($mime);
-$image->simpletype = "image";
-$image->access_id = $album->access_id;
-$image->title = substr($name, 0, strrpos($name, '.'));
-$image->batch = get_input('batch');
-$result = $image->save();
-
-$image->setOriginalFilename($name);
-$image->saveImageFile($temp_file, $file_size);
-
-$image->extractExifData();
-$image->saveThumbnails($image_lib);
-
-$album->prependImageList(array($image->guid));
-
-
-if (get_plugin_setting('img_river_view', 'tidypics') === "all") {
- add_to_river('river/object/image/create', 'create', $image->owner_guid, $image->guid);
-}
-
-echo "success";
-exit;
\ No newline at end of file
+++ /dev/null
-<?php
-/**
- * A batch is complete so check if this is first upload to album
- *
- */
-
-$album_guid = (int) get_input('album_guid');
-
-$album = get_entity($album_guid);
-if (!$album) {
- exit;
-}
-
-if ($album->new_album == TP_NEW_ALBUM) {
- $new_album = true;
-} else {
- $new_album = false;
-}
-
-if ($album->new_album == TP_NEW_ALBUM) {
- $album->new_album = TP_OLD_ALBUM;
-
- // we throw the notification manually here so users are not told about the new album until there
- // is at least a few photos in it
- object_notifications('create', 'object', $album);
-
- add_to_river('river/object/album/create', 'create', $album->owner_guid, $album->guid);
-}
-
-$params = array(
- 'type' => 'object',
- 'subtype' => 'image',
- 'metadata_names' => 'batch',
- 'metadata_values' => get_input('batch'),
-);
-$images = elgg_get_entities_from_metadata($params);
-if ($images) {
- // Create a new batch object to contain these photos
- $batch = new ElggObject();
- $batch->subtype = "tidypics_batch";
- $batch->access_id = ACCESS_PUBLIC;
- $batch->container_guid = $album->guid;
- if ($batch->save()) {
- foreach ($images as $image) {
- add_entity_relationship($image->guid, "belongs_to_batch", $batch->getGUID());
- }
- if (get_plugin_setting('img_river_view', 'tidypics') == "batch" && $new_album == false) {
- add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
- }
- }
-}
-
-// plugins can register to be told when a Tidypics album has had images added
-trigger_elgg_event('upload', 'tp_album', $album);
-
-exit;
\ No newline at end of file
--- /dev/null
+<?php
+/**
+ * Elgg single upload action for flash/ajax uploaders
+ */
+
+elgg_load_library('tidypics:upload');
+
+$album_guid = (int) get_input('album_guid');
+$file_var_name = get_input('file_var_name', 'Image');
+$batch = get_input('batch');
+
+$album = get_entity($album_guid);
+if (!$album) {
+ echo elgg_echo('tidypics:baduploadform');
+ exit;
+}
+
+// probably POST limit exceeded
+if (empty($_FILES)) {
+ trigger_error('Tidypics warning: user exceeded post limit on image upload', E_USER_WARNING);
+ register_error(elgg_echo('tidypics:exceedpostlimit'));
+ exit;
+}
+
+$file = $_FILES['Image'];
+
+$mime = tp_upload_get_mimetype($file['name']);
+if ($mime == 'unknown') {
+ echo 'Not an image';
+ exit;
+}
+
+// we have to override the mime type because uploadify sends everything as application/octet-string
+$file['type'] = $mime;
+
+$image = new TidypicsImage();
+$image->container_guid = $album->getGUID();
+$image->setMimeType($mime);
+$image->access_id = $album->access_id;
+$image->batch = $batch;
+
+try {
+ $image->save($file);
+ $album->prependImageList(array($image->guid));
+
+ if (elgg_get_plugin_setting('img_river_view', 'tidypics') === "all") {
+ add_to_river('river/object/image/create', 'create', $image->getObjectOwnerGUID(), $image->getGUID());
+ }
+
+ echo elgg_echo('success');
+} catch (Exception $e) {
+ // remove the bits that were saved
+ $image->delete();
+ echo $e->getMessage();
+}
+
+exit;
\ No newline at end of file
--- /dev/null
+<?php
+/**
+ * A batch is complete so check if this is first upload to album
+ *
+ */
+
+$batch = get_input('batch');
+$album_guid = (int) get_input('album_guid');
+$img_river_view = elgg_get_plugin_setting('img_river_view', 'tidypics');
+
+$album = get_entity($album_guid);
+if (!elgg_instanceof($album, 'object', 'album')) {
+ exit;
+}
+
+$params = array(
+ 'type' => 'object',
+ 'subtype' => 'image',
+ 'metadata_names' => 'batch',
+ 'metadata_values' => $batch,
+ 'limit' => 0
+);
+
+$images = elgg_get_entities_from_metadata($params);
+if ($images) {
+ // Create a new batch object to contain these photos
+ $batch = new ElggObject();
+ $batch->subtype = "tidypics_batch";
+ $batch->access_id = ACCESS_PUBLIC;
+ $batch->container_guid = $album->guid;
+
+ if ($batch->save()) {
+ foreach ($images as $image) {
+ add_entity_relationship($image->guid, "belongs_to_batch", $batch->getGUID());
+ }
+ }
+} else {
+ // @todo some sort of message to edit them manually.
+ exit;
+}
+
+// "added images to album" river
+if ($img_river_view == "batch" && $album->new_album == false) {
+ add_to_river('river/object/tidypics_batch/create', 'create', $batch->getObjectOwnerGUID(), $batch->getGUID());
+}
+
+// "created album" river
+if ($album->new_album) {
+ $album->new_album = false;
+ $album->first_upload = true;
+
+ add_to_river('river/object/album/create', 'create', $album->getOwnerGUID(), $album->getGUID());
+
+ // "created album" notifications
+ // we throw the notification manually here so users are not told about the new album until
+ // there are at least a few photos in it
+ if ($album->shouldNotify()) {
+ object_notifications('create', 'object', $album);
+ $album->last_notified = time();
+ }
+} else {
+ // "added image to album" notifications
+ if ($album->first_upload) {
+ $album->first_upload = false;
+ }
+
+ if ($album->shouldNotify()) {
+ object_notifications('create', 'object', $album);
+ $album->last_notified = time();
+ }
+}
+
+echo json_encode(array('batch_guid' => $batch->getGUID()));
+exit;
\ No newline at end of file
continue;
}
+ $mime = tp_upload_get_mimetype($data['name']);
+
$image = new TidypicsImage();
$image->container_guid = $album->getGUID();
$image->setMimeType($mime);
}
$file = new ElggFile();
- $file->owner_guid = $this->getObjectOwnerGUID();
+ $file->owner_guid = $this->getOwnerGUID();
$file->setFilename($thumb);
return $file->grabFile();
}
foreach ($entities as $entity) {
$keys[] = $entity->guid;
}
- var_dump($options);
+
$entities = array_combine($keys, $entities);
$sorted_entities = array();
function tp_gd_watermark($image) {
global $CONFIG;
- $watermark_text = get_plugin_setting('watermark_text', 'tidypics');
+ $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics');
if (!$watermark_text) {
return;
}
return;
}
- $owner = get_loggedin_user();
+ $owner = elgg_get_logged_in_user_guid();
$watermark_text = tp_process_watermark_text($watermark_text, $owner);
*/
function tp_imagick_watermark($filename) {
- $watermark_text = get_plugin_setting('watermark_text', 'tidypics');
+ $watermark_text = elgg_get_plugin_setting('watermark_text', 'tidypics');
if (!$watermark_text) {
return false;
}
// plugins can do their own watermark and return false to prevent this function from running
- if (trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false) {
+ if (elgg_trigger_plugin_hook('tp_watermark', 'imagick', $filename, true) === false) {
return true;
}
forward();
}
-if (elgg_get_plugin_setting('uploader', 'tidypics')) {
- $uploader = get_input('uploader', 'ajax');
-} else {
- $uploader = 'basic';
-}
-
$album = get_entity($album_guid);
if (!$album) {
// @todo
elgg_push_breadcrumb($album->getTitle(), $album->getURL());
elgg_push_breadcrumb(elgg_echo('album:addpix'));
-
+$uploader = get_input('uploader');
if ($uploader == 'basic') {
$content = elgg_view('forms/photos/basic_upload', array('entity' => $album));
} else {
* Tidypics plugin initialization
*/
function tidypics_init() {
-
// Include core libraries
require dirname(__FILE__) . "/lib/tidypics.php";
elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'tidypics_notify_message');
-/*
+ // ajax handler for uploads when use_only_cookies is set
+ elgg_register_plugin_hook_handler('forward', 'csrf', 'tidypics_ajax_session_handler');
+
+ /*
// Register for notifications
// slideshow plugin hook
register_plugin_hook('tp_slideshow', 'album', 'tidypics_slideshow');
-
- // ajax handler for uploads when use_only_cookies is set
- register_plugin_hook('forward', 'system', 'tidypics_ajax_session_handler');
*/
// Register actions
$base_dir = elgg_get_plugins_path() . 'tidypics/actions/photos';
elgg_register_action("photos/image/upload", "$base_dir/image/upload.php");
elgg_register_action("photos/image/save", "$base_dir/image/save.php");
elgg_register_action("photos/batch/edit", "$base_dir/batch/edit.php");
- //register_action("tidypics/ajax_upload", true, "$base_dir/ajax_upload.php");
- //register_action("tidypics/ajax_upload_complete", true, "$base_dir/ajax_upload_complete.php");
+ elgg_register_action("photos/image/ajax_upload", "$base_dir/image/ajax_upload.php", 'logged_in');
+ elgg_register_action("photos/image/ajax_upload_complete", "$base_dir/image/ajax_upload_complete.php", 'logged_in');
elgg_register_action("photos/image/tag", "$base_dir/image/tag.php");
elgg_register_action("photos/image/untag", "$base_dir/image/untag.php");
case "upload": // upload images to album
set_input('guid', $page[1]);
- set_input('uploader', elgg_extract(2, $page, 'basic'));
+
+ if (elgg_get_plugin_setting('uploader', 'tidypics')) {
+ $default_uploader = 'ajax';
+ } else {
+ $default_uploader = 'basic';
+ }
+
+ set_input('uploader', elgg_extract(2, $page, $default_uploader));
require "$base/image/upload.php";
break;
* @param string $returnvalue
* @param array $params
*/
-function tidypics_ajax_session_handler($hook, $entity_type, $returnvalue, $params) {
- global $CONFIG;
+function tidypics_ajax_session_handler($hook, $entity_type, $value, $params) {
+ $www_root = elgg_get_config('wwwroot');
+ $url = $params['current_url'];
- $url = current_page_url();
- if ($url !== "{$CONFIG->wwwroot}action/tidypics/ajax_upload/") {
+ if ($url !== "{$www_root}action/photos/image/ajax_upload") {
return;
}
- if (get_loggedin_userid() != 0) {
+ if (elgg_get_logged_in_user_guid() != 0) {
return;
}
$token = get_input('__elgg_token');
$ts = get_input('__elgg_ts');
$session_id = get_input('Elgg');
+ $session_token = get_input('session_token');
$tidypics_token = get_input('tidypics_token');
$user_guid = get_input('user_guid');
-
$user = get_user($user_guid);
+ $timeout = elgg_get_config('action_token_timeout');
+ if (!$timeout) {
+ $timeout = 2;
+ }
+
if (!$user) {
return;
}
$generated_token = md5($session_id . get_site_secret() . $ts . $user->salt);
if ($tidypics_token !== $generated_token) {
+ echo "bad tp token";
return;
}
// passed token test, so login and process action
login($user);
- include $CONFIG->actions['tidypics/ajax_upload']['file'];
+ $actions = elgg_get_config('actions');
+ include $actions['photos/image/ajax_upload']['file'];
exit;
}
/**
* Tidypics ajax upload form body
*
- * @uses $vars['album']
+ * @uses $vars['entity']
*/
-$album = $vars['album'];
+$album = $vars['entity'];
$ts = time();
-$token = generate_action_token($ts);
$batch = time();
-$tidypics_token = md5(session_id() . get_site_secret() . $ts . get_loggedin_user()->salt);
-
+$tidypics_token = md5(session_id() . get_site_secret() . $ts . elgg_get_logged_in_user_entity()->salt);
$basic_uploader_url = current_page_url() . '/basic';
-$upload_endpoint_url = "{$vars['url']}action/tidypics/ajax_upload/";
-$upload_complete_url = "{$vars['url']}action/tidypics/ajax_upload_complete/";
-$maxfilesize = (float) get_plugin_setting('maxfilesize','tidypics');
+$maxfilesize = (float) elgg_get_plugin_setting('maxfilesize', 'tidypics');
if (!$maxfilesize) {
$maxfilesize = 5;
}
-$quota = get_plugin_setting('quota','tidypics');
+$quota = elgg_get_plugin_setting('quota', 'tidypics');
if ($quota) {
$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
$image_repo_size = (int)$image_repo_size_md->value;
?>
-<div class="contentWrapper">
-
- <p><?php echo sprintf(elgg_echo('tidypics:uploader:instructs'), $basic_uploader_url); ?></p>
+<p><?php echo elgg_echo('tidypics:uploader:instructs', array($basic_uploader_url)); ?></p>
- <ul id="tidypics_uploader_steps">
- <li>
- <div id="tidypics_uploader">
- <a id="tidypics_choose_button" href="<?php echo $basic_uploader_url; ?>">
- 1. <?php echo elgg_echo('tidypics:uploader:choose'); ?>
- </a>
- <div id="tidypics_flash_uploader">
- <input type="file" id="uploadify" name="uploadify" />
- </div>
- </div>
- </li>
- <li>
- <a id="tidypics_upload_button" class="tidypics_disable" href="javascript:$('#uploadify').uploadifyUpload();">
- 2. <?php echo elgg_echo('tidypics:uploader:upload'); ?>
+<ul id="tidypics-uploader-steps">
+ <li class="mbm">
+ <div id="tidypics-uploader">
+ <a id="tidypics-choose-button" href="<?php echo $basic_uploader_url; ?>">
+ 1. <?php echo elgg_echo('tidypics:uploader:choose'); ?>
</a>
- </li>
- <li>
- <a id="tidypics_describe_button" class="tidypics_disable" href="<?php echo $vars['url']; ?>pg/photos/batch/<?php echo $batch; ?>">
- 3. <?php echo elgg_echo('tidypics:uploader:describe'); ?>
- </a>
- </li>
- </ul>
-</div>
+ <div id="tidypics-flash-uploader">
+ <input type="file" id="uploadify" name="uploadify" class="hidden" />
+ <input type="hidden" name="album_guid" value="<?php echo $album->getGUID(); ?>" />
+ <input type="hidden" name="batch" value="<?php echo $batch; ?>" />
+ <input type="hidden" name="tidypics_token" value="<?php echo $tidypics_token; ?>" />
+ <input type="hidden" name="user_guid" value="<?php echo elgg_get_logged_in_user_guid(); ?>" />
+ <input type="hidden" name="Elgg" value="<?php echo session_id(); ?>" />
+ </div>
+ </div>
+ </li>
+ <li class="mbm">
+ <a id="tidypics-upload-button" class="tidypics-disable" href="#">
+ 2. <?php echo elgg_echo('tidypics:uploader:upload'); ?>
+ </a>
+ </li>
+ <li class="mbm">
+ <a id="tidypics-describe-button" class="tidypics-disable" href="#">
+ 3. <?php echo elgg_echo('tidypics:uploader:describe'); ?>
+ </a>
+ </li>
+</ul>
<?php
/**
- *
+ * AJAX uploading
*/
-
-$site_url = elgg_get_site_url();
-$upload_endpoint_url = "{$site_url}action/tidypics/ajax_upload/";
-$upload_complete_url = "{$site_url}action/tidypics/ajax_upload_complete/";
-
?>
+//<script>
elgg.provide('elgg.tidypics.uploading');
elgg.tidypics.uploading.init = function() {
+
+ var fields = ['Elgg', 'user_guid', 'album_guid', 'batch', 'tidypics_token'];
+ var data = elgg.security.token;
+
+ $(fields).each(function(i, name) {
+ var value = $('input[name=' + name + ']').val();
+ if (value) {
+ data[name] = value;
+ }
+ });
+
+ data['XDEBUG_SESSION_START'] = 'netbeans-xdebug';
+
$("#uploadify").uploadify({
- 'uploader' : '<?php echo $site_url; ?>mod/tidypics/vendors/uploadify/uploadify.swf',
- 'script' : '<?php echo $upload_endpoint_url; ?>',
+ 'uploader' : elgg.config.wwwroot + 'mod/tidypics/vendors/uploadify/uploadify.swf',
+ 'script' : elgg.config.wwwroot + 'action/photos/image/ajax_upload',
+ 'cancelImg' : elgg.config.wwwroot + 'mod/tidypics/vendors/uploadify/cancel.png',
'fileDataName' : 'Image',
'multi' : true,
'auto' : false,
'wmode' : 'transparent',
'buttonImg' : " ",
- 'height' : 20,
- 'width' : 130
+ 'height' : $('#tidypics-choose-button').height(),
+ 'width' : $('#tidypics-choose-button').width(),
+ 'scriptData' : data,
+ 'onEmbedFlash' : function(event) {
+ // @todo This is supposed to mimick hovering over the link.
+ // hover events aren't firing for the object.
+ $("#" + event.id).hover(
+ function(){
+ $("#tidypics-choose-button").addClass('tidypics-choose-button-hover');
+ },
+ function(){
+ $("#tidypics-choose-button").removeClass('tidypics-choose-button-hover');
+ }
+ );
+ },
+ 'onSelectOnce' : function() {
+ $("#tidypics-upload-button").removeClass('tidypics-disable');
+ },
+ 'onAllComplete' : function() {
+ // @todo they can keep adding pics if they want. no need to disable this.
+ $("#tidypics-choose-button").addClass('tidypics-disable');
+ $("#tidypics-upload-button").addClass('tidypics-disable').die();
+ $("#tidypics-describe-button").removeClass('tidypics-disable');
+
+ elgg.action('photos/image/ajax_upload_complete', {
+ data: {
+ album_guid: data.album_guid,
+ batch: data.batch
+ },
+ success: function(json) {
+ var url = elgg.normalize_url('photos/edit/' + json.batch_guid)
+ $('#tidypics-describe-button').attr('href', url);
+ }
+ });
+ },
+ 'onComplete' : function(event, queueID, fileObj, response) {
+ // check for errors here
+ if (response != 'success') {
+ $("#uploadify" + queueID + " .percentage").text(" - " + response);
+ $("#uploadify" + queueID).addClass('uploadifyError');
+ }
+ $("#uploadify" + queueID + " > .cancel").remove();
+ return false;
+ },
+ 'onCancel' : function(event, queueID, fileObj, data) {
+ if (data.fileCount == 0) {
+ $("#tidypics-upload-button").addClass('tidypics-disable');
+ }
+ }
+
+ });
+
+ // bind to upload button
+ $('#tidypics-upload-button').live('click', function(e) {
+ var $uploadify = $('#uploadify');
+ $uploadify.uploadifyUpload();
+ e.preventDefault();
});
}
Tagging
*************************************** */
#tidypics_uploader {
-position:relative;
-width:400px;
-min-height:20px;
+ position:relative;
+ width:400px;
+ min-height:20px;
}
#tidypics_choose_button {
+ position:absolute;
+ top:0;
+ left:0;
+ z-index:0;
+ display:block;
+ float:left;
+}
+
+#tidypics_flash_uploader {
+ position:relative;
+ z-index:100;
+}
+
+/* ***************************************
+ AJAX UPLOADER
+*************************************** */
+#tidypics-uploader-steps {
+ list-style: none;
+}
+
+#tidypics-uploader-steps li a {
+ font-weight:bold;
+}
+
+.tidypics-choose-button-hover {
+ color:#0054a7;
+ text-decoration:underline;
+}
+
+.tidypics-disable {
+ color:#cccccc;
+}
+
+.tidypics-disable:hover {
+color:#cccccc;
+text-decoration:none;
+}
+
+
+.uploadifyQueueItem {
+background-color:#F5F5F5;
+border:2px solid #E5E5E5;
+font-size:11px;
+margin-top:5px;
+padding:10px;
+width:350px;
+}
+
+.uploadifyProgress {
+background-color:#FFFFFF;
+border-color:#808080 #C5C5C5 #C5C5C5 #808080;
+border-style:solid;
+border-width:1px;
+margin-top:10px;
+width:100%;
+}
+
+.uploadifyProgressBar {
+background-color: #0054a7;
+width: 1px;
+height: 3px;
+}
+
+#tidypics-uploader {
+ position:relative;
+ width:400px;
+ min-height:20px;
+}
+
+#tidypics-choose-button {
position:absolute;
top:0;
left:0;
float:left;
}
-#tidypics_flash_uploader {
+#tidypics-flash-uploader {
position:relative;
z-index:100;
}
+.uploadifyQueueItem .cancel {
+ float: right;
+}
+
+.uploadifyError {
+border: 2px solid #FBCBBC;
+background-color: #FDE5DD;
+}
+
<?php
return true;
?>
list-style: none;
}
-/*----- uploadify ------*/
-
-#tidypics_uploader_steps {
-list-style:none;
-}
-
-#tidypics_uploader_steps li {
-margin-bottom: 20px;
-}
-
-#tidypics_uploader_steps li a {
-font-weight:bold;
-}
-
-.tidypics_choose_button_hover {
-color:#0054a7;
-text-decoration:underline;
-}
-
-.tidypics_disable {
-color:#cccccc;
-}
-
-.tidypics_disable:hover {
-color:#cccccc;
-text-decoration:none;
-}
-
-
-.uploadifyQueueItem {
-background-color:#F5F5F5;
-border:2px solid #E5E5E5;
-font-size:11px;
-margin-top:5px;
-padding:10px;
-width:350px;
-}
-
-.uploadifyProgress {
-background-color:#FFFFFF;
-border-color:#808080 #C5C5C5 #C5C5C5 #808080;
-border-style:solid;
-border-width:1px;
-margin-top:10px;
-width:100%;
-}
-
-.uploadifyProgressBar {
-background-color: #0054a7;
-width: 1px;
-height: 3px;
-}
-
-#tidypics_uploader {
-position:relative;
-width:400px;
-min-height:20px;
-}
-
-#tidypics_choose_button {
-position:absolute;
-top:0;
-left:0;
-z-index:0;
-display:block;
-float:left;
-}
-
-#tidypics_flash_uploader {
-position:relative;
-z-index:100;
-}
-
-.uploadifyQueueItem .cancel {
-float: right;
-}
-
-.uploadifyError {
-border: 2px solid #FBCBBC;
-background-color: #FDE5DD;
-}
-
#tidypics_album_sort {
padding:0;
margin:0;
projects / lorea / elgg.git / commitdiff