aboutsummaryrefslogtreecommitdiff
path: root/actions/photos
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-29 04:19:50 +0200
committerSem <sembrestels@riseup.net>2012-07-29 04:19:50 +0200
commit55bb2b7ed2583683548e314ae13fadde61eb04d6 (patch)
tree18aa780112c293ef078b7651a0c7f08ffd6b13da /actions/photos
parent7a9177c9df49d6fc02280df02d6e7f6d52531382 (diff)
parent12a88208acec40e190b0729887e28c9d9add26c3 (diff)
downloadelgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.gz
elgg-55bb2b7ed2583683548e314ae13fadde61eb04d6.tar.bz2
Merge branch 'no-tagging-photos' of git://github.com/sembrestels/Tidypics
Conflicts: languages/de.php languages/en.php start.php views/default/forms/photos/admin/settings/main.php views/default/photos/css.php
Diffstat (limited to 'actions/photos')
-rw-r--r--actions/photos/image/tag.php109
-rw-r--r--actions/photos/image/untag.php24
2 files changed, 0 insertions, 133 deletions
diff --git a/actions/photos/image/tag.php b/actions/photos/image/tag.php
deleted file mode 100644
index e623bd546..000000000
--- a/actions/photos/image/tag.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Add photo tag action
- *
- * @author Cash Costello
- * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License v2
- */
-
-$coordinates_str = get_input('coordinates');
-$username = get_input('username');
-$image_guid = get_input('guid');
-
-if ($image_guid == 0) {
- register_error(elgg_echo("tidypics:phototagging:error"));
- forward(REFERER);
-}
-
-$image = get_entity($image_guid);
-if (!$image) {
- register_error(elgg_echo("tidypics:phototagging:error"));
- forward(REFERER);
-}
-
-if (empty($username)) {
- register_error(elgg_echo("tidypics:phototagging:error"));
- forward(REFERER);
-}
-
-$user = get_user_by_username($username);
-if (!$user) {
- // plain tag
- $relationships_type = 'word';
- $value = $username;
-} else {
- $relationships_type = 'user';
- $value = $user->guid;
-}
-
-/* // not adding as plain tag yet
-$new_word_tag = false;
-if ($user_id != 0) {
- $relationships_type = 'user';
- $value = $user_id;
-} else {
- $relationships_type = 'word';
- $value = $word;
-
- // check to see if the photo has this tag and add if not
- if (!is_array($image->tags)) {
- if ($image->tags != $word) {
- $new_word_tag = true;
- $tagarray = $image->tags . ',' . $word;
- $tagarray = string_to_tag_array($tagarray);
- }
- } else {
- if (!in_array($word, $image->tags)) {
- $new_word_tag = true;
- $tagarray = $image->tags;
- $tagarray[] = $word;
- }
- }
-}
-
-// add new tag now so it is available in search
-if ($new_word_tag) {
- $image->clearMetadata('tags');
- $image->tags = $tagarray;
-}
-*/
-
-$tag = new stdClass();
-$tag->coords = $coordinates_str;
-$tag->type = $relationships_type;
-$tag->value = $value;
-$access_id = $image->getAccessID();
-
-$annotation_id = $image->annotate('phototag', serialize($tag), $access_id);
-if ($annotation_id) {
- // if tag is a user id, add relationship for searching (find all images with user x)
- if ($tag->type === 'user') {
- if (!check_entity_relationship($tag->value, 'phototag', $image_guid)) {
- add_entity_relationship($tag->value, 'phototag', $image_guid);
-/*
- // also add this to the river - subject is image, object is the tagged user
- add_to_river('river/object/image/tag', 'tag', $tagger->guid, $user_id, $access_id, 0, $annotation_id);
-
- // notify user of tagging as long as not self
- if ($owner_id != $user_id) {
- notify_user(
- $user_id,
- $owner_id,
- elgg_echo('tidypics:tag:subject'),
- sprintf(
- elgg_echo('tidypics:tag:body'),
- $image->getTitle(),
- $tagger->name,
- $image->getURL()
- )
- );
- }
- *
- */
- }
- }
-
- system_message(elgg_echo("tidypics:phototagging:success"));
-}
-
-forward(REFERER);
diff --git a/actions/photos/image/untag.php b/actions/photos/image/untag.php
deleted file mode 100644
index 11c433a61..000000000
--- a/actions/photos/image/untag.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Remove photo tag action
- */
-
-$annotation = elgg_get_annotation_from_id(get_input('annotation_id'));
-
-if (!$annotation instanceof ElggAnnotation || $annotation->name != 'phototag') {
- register_error(elgg_echo("tidypics:phototagging:delete:error"));
- forward(REFERER);
-}
-
-if (!$annotation->canEdit()) {
- register_error(elgg_echo("tidypics:phototagging:delete:error"));
- forward(REFERER);
-}
-
-if ($annotation->delete()) {
- system_message(elgg_echo("tidypics:phototagging:delete:success"));
-} else {
- system_message(elgg_echo("tidypics:phototagging:delete:error"));
-}
-
-forward(REFERER);