aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorZach Prezkuta <fermion@gmx.com>2012-06-20 20:36:10 -0600
committerZach Prezkuta <fermion@gmx.com>2012-06-20 20:51:03 -0600
commit54c76ca822978ebb97cd5b6dfdff0ea3f4f4fe7c (patch)
tree0c24210010aeba5a72f6d69b459ec620a53d12e2 /mod
parent75e82dc0779b0fe7ebedb26e4c12660f00435bae (diff)
downloadvolse-hubzilla-54c76ca822978ebb97cd5b6dfdff0ea3f4f4fe7c.tar.gz
volse-hubzilla-54c76ca822978ebb97cd5b6dfdff0ea3f4f4fe7c.tar.bz2
volse-hubzilla-54c76ca822978ebb97cd5b6dfdff0ea3f4f4fe7c.zip
allow rotation either CW or CCW
Diffstat (limited to 'mod')
-rw-r--r--mod/photos.php21
1 files changed, 12 insertions, 9 deletions
diff --git a/mod/photos.php b/mod/photos.php
index 91adbb33b..d96bc135e 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -306,7 +306,8 @@ function photos_post(&$a) {
$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
- if((x($_POST,'rotate') !== false) && (intval($_POST['rotate']) == 1)) {
+ if((x($_POST,'rotate') !== false) &&
+ ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
logger('rotate');
$r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1",
@@ -316,7 +317,8 @@ function photos_post(&$a) {
if(count($r)) {
$ph = new Photo($r[0]['data'], $r[0]['type']);
if($ph->is_valid()) {
- $ph->rotate(270);
+ $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
+ $ph->rotate($rotate_deg);
$width = $ph->getWidth();
$height = $ph->getHeight();
@@ -325,8 +327,8 @@ function photos_post(&$a) {
dbesc($ph->imageString()),
intval($height),
intval($width),
- dbesc($resource_id),
- intval($page_owner_uid)
+ dbesc($resource_id),
+ intval($page_owner_uid)
);
if($width > 640 || $height > 640) {
@@ -338,8 +340,8 @@ function photos_post(&$a) {
dbesc($ph->imageString()),
intval($height),
intval($width),
- dbesc($resource_id),
- intval($page_owner_uid)
+ dbesc($resource_id),
+ intval($page_owner_uid)
);
}
@@ -352,8 +354,8 @@ function photos_post(&$a) {
dbesc($ph->imageString()),
intval($height),
intval($width),
- dbesc($resource_id),
- intval($page_owner_uid)
+ dbesc($resource_id),
+ intval($page_owner_uid)
);
}
}
@@ -1251,7 +1253,8 @@ function photos_content(&$a) {
$edit_tpl = get_markup_template('photo_edit.tpl');
$edit = replace_macros($edit_tpl, array(
'$id' => $ph[0]['id'],
- '$rotate' => t('Rotate CW'),
+ '$rotatecw' => t('Rotate CW (right)'),
+ '$rotateccw' => t('Rotate CCW (left)'),
'$album' => template_escape($ph[0]['album']),
'$newalbum' => t('New album name'),
'$nickname' => $a->data['user']['nickname'],