aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-02-19 19:59:22 +0000
committerplegall <plg@piwigo.org>2012-02-19 19:59:22 +0000
commit25200e2c2550130453cdd16cdc76e8b9e50357e8 (patch)
treec1e5d1009f1f3be3e08f2fda8a4275cbac9e3aa4 /admin
parentf718a18561915a6d547e96a7aef8f75283981853 (diff)
convert tabulations into 2-spaces for indentation (introduced in r13240)
git-svn-id: http://piwigo.org/svn/trunk@13258 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin.php4
-rw-r--r--admin/derivatives.php60
2 files changed, 32 insertions, 32 deletions
diff --git a/admin.php b/admin.php
index f15b9ab0e..2ab0409f0 100644
--- a/admin.php
+++ b/admin.php
@@ -255,8 +255,8 @@ if (
)
or ( !empty($_POST) and in_array($page['page'],
array(
- 'photo',
- 'album', // public/private; lock/unlock, permissions
+ 'photo',
+ 'album', // public/private; lock/unlock, permissions
'batch_manager', // associate/dissociate; delete; set level
'user_list', // group assoc; user level
)
diff --git a/admin/derivatives.php b/admin/derivatives.php
index 283dceb72..e271c0d65 100644
--- a/admin/derivatives.php
+++ b/admin/derivatives.php
@@ -52,36 +52,36 @@ if ( isset($_POST['d']) )
if (!$pderivative['enabled'])
continue;
- if ($type==IMG_THUMB)
- {
- $w = intval($pderivative['w']);
- if ($w<=0)
- {
- $errors[$type]['w'] = '>0';
- }
- $h = intval($pderivative['h']);
- if ($h<=0)
- {
- $errors[$type]['h'] = '>0';
- }
- if (max($w,$h) <= $prev_w)
- {
- $errors[$type]['w'] = $errors[$type]['h'] = '>'.$prev_w;
- }
- }
- else
- {
- $v = intval($pderivative['w']);
- if ($v<=0 || $v<=$prev_w)
- {
- $errors[$type]['w'] = '>'.$prev_w;
- }
- $v = intval($pderivative['h']);
- if ($v<=0 || $v<=$prev_h)
- {
- $errors[$type]['h'] = '>'.$prev_h;
- }
- }
+ if ($type==IMG_THUMB)
+ {
+ $w = intval($pderivative['w']);
+ if ($w<=0)
+ {
+ $errors[$type]['w'] = '>0';
+ }
+ $h = intval($pderivative['h']);
+ if ($h<=0)
+ {
+ $errors[$type]['h'] = '>0';
+ }
+ if (max($w,$h) <= $prev_w)
+ {
+ $errors[$type]['w'] = $errors[$type]['h'] = '>'.$prev_w;
+ }
+ }
+ else
+ {
+ $v = intval($pderivative['w']);
+ if ($v<=0 || $v<=$prev_w)
+ {
+ $errors[$type]['w'] = '>'.$prev_w;
+ }
+ $v = intval($pderivative['h']);
+ if ($v<=0 || $v<=$prev_h)
+ {
+ $errors[$type]['h'] = '>'.$prev_h;
+ }
+ }
$v = intval($pderivative['crop']);
if ($v<0 || $v>100)
{