aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--admin.php4
-rw-r--r--admin/derivatives.php60
-rw-r--r--include/functions.inc.php16
-rw-r--r--include/functions_url.inc.php56
-rw-r--r--include/section_init.inc.php2
5 files changed, 69 insertions, 69 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)
{
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 5b05452c0..2e4052ce9 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -890,14 +890,14 @@ function l10n($key)
{
global $lang, $conf;
- if ( ($val=@$lang[$key]) == null)
- {
- if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
- {
- trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_WARNING);
- }
- $val = $key;
- }
+ if ( ($val=@$lang[$key]) == null)
+ {
+ if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
+ {
+ trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_WARNING);
+ }
+ $val = $key;
+ }
return $val;
}
diff --git a/include/functions_url.inc.php b/include/functions_url.inc.php
index fdaaca589..5f86495e4 100644
--- a/include/functions_url.inc.php
+++ b/include/functions_url.inc.php
@@ -33,12 +33,12 @@ function get_root_url()
if ( ($root_url = @$page['root_path']) == null )
{// TODO - add HERE the possibility to call PWG functions from external scripts
$root_url = PHPWG_ROOT_PATH;
- if ( strncmp($root_url, './', 2) == 0 )
- {
- return substr($root_url, 2);
- }
+ if ( strncmp($root_url, './', 2) == 0 )
+ {
+ return substr($root_url, 2);
+ }
}
- return $root_url;
+ return $root_url;
}
/**
@@ -300,29 +300,29 @@ function make_section_in_url($params)
{
global $conf;
$section_string = '';
- $section = @$params['section'];
- if (!isset($section))
- {
- $section_of = array(
- 'category' => 'categories',
- 'tags' => 'tags',
- 'list' => 'list',
- 'search' => 'search',
- );
-
- foreach ($section_of as $param => $s)
- {
- if (isset($params[$param]))
- {
- $section = $s;
- }
- }
-
- if (!isset($section))
- {
- $section = 'none';
- }
- }
+ $section = @$params['section'];
+ if (!isset($section))
+ {
+ $section_of = array(
+ 'category' => 'categories',
+ 'tags' => 'tags',
+ 'list' => 'list',
+ 'search' => 'search',
+ );
+
+ foreach ($section_of as $param => $s)
+ {
+ if (isset($params[$param]))
+ {
+ $section = $s;
+ }
+ }
+
+ if (!isset($section))
+ {
+ $section = 'none';
+ }
+ }
switch($section)
{
diff --git a/include/section_init.inc.php b/include/section_init.inc.php
index fa51fa7fc..3ddfafa32 100644
--- a/include/section_init.inc.php
+++ b/include/section_init.inc.php
@@ -69,7 +69,7 @@ else
if ( strncmp($page['root_path'], './', 2) == 0 )
{
- $page['root_path'] = substr($page['root_path'], 2);
+ $page['root_path'] = substr($page['root_path'], 2);
}
// deleting first "/" if displayed