archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert tabulations into 2-spaces for indentation (introduced in r13240)

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@13258 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2012-02-19 19:59:22 +00:00
parent f718a18561
commit 25200e2c25
5 changed files with 67 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin.php
View file

@ -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
)

60
admin/derivatives.php
View file

@ -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)
{

16
include/functions.inc.php
View file

@ -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;
}

52
include/functions_url.inc.php
View file

@ -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',
);
$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;
}
}
foreach ($section_of as $param => $s)
{
if (isset($params[$param]))
{
$section = $s;
}
}
if (!isset($section))
{
$section = 'none';
}
}
if (!isset($section))
{
$section = 'none';
}
}
switch($section)
{

2
include/section_init.inc.php
View file

@ -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