From c51b483f24936c8d04a54a6999412937ec21c49a Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 19 Nov 2011 23:13:26 -0500 Subject: uploading photos through the basic interface works now --- pages/edit_multiple.php | 52 --------------------------- pages/photos/batch/edit.php | 44 +++++++++++++++++++++++ pages/photos/image/thumbnail.php | 34 ++++++++++++++++++ pages/photos/image/upload.php | 61 +++++++++++++++---------------- pages/thumbnail.php | 78 ---------------------------------------- 5 files changed, 107 insertions(+), 162 deletions(-) delete mode 100644 pages/edit_multiple.php create mode 100644 pages/photos/batch/edit.php create mode 100644 pages/photos/image/thumbnail.php delete mode 100644 pages/thumbnail.php (limited to 'pages') diff --git a/pages/edit_multiple.php b/pages/edit_multiple.php deleted file mode 100644 index 7c7b989cf..000000000 --- a/pages/edit_multiple.php +++ /dev/null @@ -1,52 +0,0 @@ - 'batch', - 'metadata_value' => $batch, - 'type' => 'object', - 'subtype' => 'image', - 'owner_guid' => get_loggedin_userid(), - 'limit' => ELGG_ENTITIES_NO_VALUE, - )); -} else { - // parse out photo guids - $file_string = get_input('files'); - $file_array_sent = explode('-', $file_string); - - $images = array(); - foreach ($file_array_sent as $file_guid) { - if ($entity = get_entity($file_guid)) { - if ($entity->canEdit()) { - array_push($images, $entity); - } - } - } -} - -if (!$images) { - forward($_SERVER['HTTP_REFERER']); -} - - -$title = elgg_echo('tidypics:editprops'); - -$content .= elgg_view_title($title); -$content .= elgg_view("tidypics/forms/edit_multi", array('images' => $images)); - -$body = elgg_view_layout('two_column_left_sidebar', '', $content); -page_draw($title, $body); diff --git a/pages/photos/batch/edit.php b/pages/photos/batch/edit.php new file mode 100644 index 000000000..b96ddf408 --- /dev/null +++ b/pages/photos/batch/edit.php @@ -0,0 +1,44 @@ +canEdit()) { + // @todo cannot change it + forward('photos/all'); +} + +$album = $batch->getContainerEntity(); + +elgg_set_page_owner_guid($batch->getContainerEntity()->getContainerGUID()); +$owner = elgg_get_page_owner_entity(); + +$title = elgg_echo('tidypics:editprops'); + +elgg_push_breadcrumb(elgg_echo('photos'), "photos/all"); +elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +elgg_push_breadcrumb($album->title, $album->getURL()); +elgg_push_breadcrumb($title); + +$content = elgg_view_form('photos/batch/edit', array(), array('batch' => $batch)); + +$body = elgg_view_layout('content', array( + 'filter' => false, + 'content' => $content, + 'title' => elgg_echo('tidypics:editprops'), + 'sidebar' => elgg_view('tidypics/sidebar', array('page' => 'album')), +)); + +echo elgg_view_page($title, $body); diff --git a/pages/photos/image/thumbnail.php b/pages/photos/image/thumbnail.php new file mode 100644 index 000000000..ae07f2706 --- /dev/null +++ b/pages/photos/image/thumbnail.php @@ -0,0 +1,34 @@ +getThumbnail($size); +if (!$contents) { + forward("mod/tidypics/graphics/image_error_$size"); +} + +// expires every 14 days +$expires = 14 * 60*60*24; + +// overwrite header caused by php session code so images can be cached +$mime = $image->getMimeType(); +header("Content-Type: $mime"); +header("Content-Length: " . strlen($contents)); +header("Cache-Control: public", true); +header("Pragma: public", true); +header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true); + +// Return the thumbnail and exit +echo $contents; +exit; diff --git a/pages/photos/image/upload.php b/pages/photos/image/upload.php index 6580c6f52..526972a35 100644 --- a/pages/photos/image/upload.php +++ b/pages/photos/image/upload.php @@ -1,62 +1,59 @@ canEdit()) { + // @todo // throw warning and forward to previous page - forward($_SERVER['HTTP_REFERER']); + forward(REFERER); +} + +if (!$album->canEdit()) { + // @todo have to be able to edit album to upload photos } // set page owner based on container (user or group) -set_page_owner($album->container_guid); +elgg_set_page_owner_guid($album->getContainerGUID()); +$owner = elgg_get_page_owner_entity(); -$page_owner = page_owner_entity(); -if ($page_owner instanceof ElggGroup) { - add_submenu_item( sprintf(elgg_echo('album:group'),$page_owner->name), - $CONFIG->wwwroot . "pg/photos/owned/" . $page_owner->username); -} +$title = elgg_echo('album:addpix'); -set_context('photos'); -$title = elgg_echo('album:addpix') . ': ' . $album->title; -$area2 .= elgg_view_title($title); +// set up breadcrumbs +elgg_push_breadcrumb(elgg_echo('photos'), "photos/all"); +elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username"); +elgg_push_breadcrumb($album->getTitle(), $album->getURL()); +elgg_push_breadcrumb(elgg_echo('album:addpix')); -if ($uploader == 'basic') { - $area2 .= elgg_view('input/form', array( - 'action' => "{$CONFIG->wwwroot}action/tidypics/upload", - 'body' => elgg_view('forms/tidypics/basic_upload', array('album' => $album)), - 'internalid' => 'tidypicsUpload', - 'enctype' => 'multipart/form-data', - 'method' => 'post', - )); +if ($uploader == 'basic') { + $content = elgg_view('forms/photos/basic_upload', array('entity' => $album)); } else { - $area2 .= elgg_view("forms/tidypics/ajax_upload", array('album' => $album)); + $content = elgg_view('forms/photos/ajax_upload', array('entity' => $album)); } -$body = elgg_view_layout('two_column_left_sidebar', '', $area2); +$body = elgg_view_layout('content', array( + 'content' => $content, + 'title' => $title, + 'filter' => '', +)); -page_draw($title, $body); +echo elgg_view_page($title, $body); diff --git a/pages/thumbnail.php b/pages/thumbnail.php deleted file mode 100644 index 9daa2f9c0..000000000 --- a/pages/thumbnail.php +++ /dev/null @@ -1,78 +0,0 @@ -getSubtype() != "image") { - forward('mod/tidypics/graphics/' . $error_image); -} - -// Get filename -if ($size == "thumb") { - $thumbfile = $file->thumbnail; -} else if ($size == "small") { - $thumbfile = $file->smallthumb; -} else { - $thumbfile = $file->largethumb; -} - -if (!$thumbfile) { - forward('mod/tidypics/graphics/' . $error_image); -} - -// create Elgg File object -$readfile = new ElggFile(); -$readfile->owner_guid = $file->owner_guid; -$readfile->setFilename($thumbfile); -$contents = $readfile->grabFile(); - -// send error image if file could not be read -if (!$contents) { - forward('mod/tidypics/graphics/' . $error_image); -} - -// expires every 14 days -$expires = 14 * 60*60*24; - -// overwrite header caused by php session code so images can be cached -$mime = $file->getMimeType(); -header("Content-Type: $mime"); -header("Content-Length: " . strlen($contents)); -header("Cache-Control: public", true); -header("Pragma: public", true); -header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT', true); - -// Return the thumbnail and exit -echo $contents; -exit; -- cgit v1.2.3