aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-10-23 17:56:46 +0000
committerz0rglub <z0rglub@piwigo.org>2004-10-23 17:56:46 +0000
commit98b65edb831e95695cc840692ab8ad294478f80d (patch)
tree2b1ffe5ba3c8bc1fcdb209e8f8d793bd18e9dd1d /admin
parent60ac6f180e9500c6fea0c872277f107f05d7d26d (diff)
- refactoring of comments.php
- creation of function get_thumbnail_src used everywhere a thumbnail must be displayed - creation of function parse_comment_content (used in comments.php and picture.php) - concerning undefined index on arrays retrieved in database, instead of testing possibly unset values, use of @ operator (smarter...) - add pre tag in default.css stylesheet for debugging purpose (need to have left aligned text) git-svn-id: http://piwigo.org/svn/trunk@579 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/infos_images.php47
-rw-r--r--admin/picture_modify.php42
2 files changed, 18 insertions, 71 deletions
diff --git a/admin/infos_images.php b/admin/infos_images.php
index caa7d07d9..0c95bdf5b 100644
--- a/admin/infos_images.php
+++ b/admin/infos_images.php
@@ -319,40 +319,9 @@ SELECT *
$result = mysql_query($query);
while ($row = mysql_fetch_array($result))
{
- if (!isset($array_cat_directories[$row['storage_category_id']]))
- {
- $array_cat_directories[$row['storage_category_id']] =
- get_complete_dir($row['storage_category_id']);
- }
-
- // thumbnail url
- if (isset($row['tn_ext']) and $row['tn_ext'] != '')
- {
- $thumbnail_url = $array_cat_directories[$row['storage_category_id']];
- $thumbnail_url.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_url.= get_filename_wo_extension($row['file']);
- $thumbnail_url.= '.'.$row['tn_ext'];
- }
- else
- {
- $thumbnail_url = PHPWG_ROOT_PATH;
- $thumbnail_url = 'template/'.$user['template'].'/mimetypes/';
- $thumbnail_url.= strtolower(get_extension($row['file'])).'.png';
- }
-
- // some fields are nullable in the images table
- $nullables = array('name','author','keywords','date_creation','comment');
- foreach ($nullables as $field)
- {
- if (isset($row[$field]))
- {
- $$field = $row[$field];
- }
- else
- {
- $$field = '';
- }
- }
+ $thumbnail_url = get_thumbnail_src($row['file'],
+ $row['storage_category_id'],
+ @$row['tn_ext']);
$template->assign_block_vars(
'picture',
@@ -362,11 +331,11 @@ SELECT *
'TN_URL_IMG'=>$thumbnail_url,
'FILENAME_IMG'=>$row['file'],
'DEFAULTNAME_IMG'=>get_filename_wo_extension($row['file']),
- 'NAME_IMG'=>$name,
- 'DATE_IMG'=>date_convert_back($date_creation),
- 'AUTHOR_IMG'=>$author,
- 'KEYWORDS_IMG'=>$keywords,
- 'COMMENT_IMG'=>$comment
+ 'NAME_IMG'=>@$row['name'],
+ 'DATE_IMG'=>date_convert_back(@$row['date_creation']),
+ 'AUTHOR_IMG'=>@$row['author'],
+ 'KEYWORDS_IMG'=>@$row['keywords'],
+ 'COMMENT_IMG'=>@$row['comment']
));
}
diff --git a/admin/picture_modify.php b/admin/picture_modify.php
index 42259dd9e..1e0e7ce31 100644
--- a/admin/picture_modify.php
+++ b/admin/picture_modify.php
@@ -187,17 +187,6 @@ SELECT *
;';
$row = mysql_fetch_array(mysql_query($query));
-// some fields are nullable in the images table
-$nullables = array('name','author','keywords','date_creation','comment',
- 'width','height');
-foreach ($nullables as $field)
-{
- if (!isset($row[$field]))
- {
- $row[$field] = '';
- }
-}
-
if (empty($row['name']))
{
$title = str_replace('_', ' ',get_filename_wo_extension($row['file']));
@@ -210,25 +199,14 @@ else
$current_category = get_cat_info($row['storage_category_id']);
$dir_path = get_cat_display_name($current_category['name'], '-&gt;', '');
-// thumbnail url
-if (isset($row['tn_ext']) and $row['tn_ext'] != '')
-{
- $thumbnail_url = get_complete_dir($row['storage_category_id']);
- $thumbnail_url.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_url.= get_filename_wo_extension($row['file']);
- $thumbnail_url.= '.'.$row['tn_ext'];
-}
-else
-{
- $thumbnail_url = PHPWG_ROOT_PATH;
- $thumbnail_url = 'template/'.$user['template'].'/mimetypes/';
- $thumbnail_url.= strtolower(get_extension($row['file'])).'.png';
-}
+$thumbnail_url = get_thumbnail_src($row['file'],
+ $row['storage_category_id'],
+ @$row['tn_ext']);
$url_img = PHPWG_ROOT_PATH.'picture.php?image_id='.$_GET['image_id'];
$url_img .= '&amp;cat='.$row['storage_category_id'];
$date = isset($_POST['date_creation']) && empty($errors)
- ?$_POST['date_creation']:date_convert_back($row['date_creation']);
+ ?$_POST['date_creation']:date_convert_back(@$row['date_creation']);
// retrieving all the linked categories
$query = '
@@ -257,14 +235,14 @@ $template->assign_vars(array(
'URL_IMG'=>add_session_id($url_img),
'DEFAULT_NAME_IMG'=>str_replace('_',' ',get_filename_wo_extension($row['file'])),
'FILE_IMG'=>$row['file'],
- 'NAME_IMG'=>isset($_POST['name'])?$_POST['name']:$row['name'],
- 'SIZE_IMG'=>$row['width'].' * '.$row['height'],
- 'FILESIZE_IMG'=>$row['filesize'].' KB',
+ 'NAME_IMG'=>isset($_POST['name'])?$_POST['name']:@$row['name'],
+ 'SIZE_IMG'=>@$row['width'].' * '.@$row['height'],
+ 'FILESIZE_IMG'=>@$row['filesize'].' KB',
'REGISTRATION_DATE_IMG'=> format_date($row['date_available']),
- 'AUTHOR_IMG'=>isset($_POST['author'])?$_POST['author']:$row['author'],
+ 'AUTHOR_IMG'=>isset($_POST['author'])?$_POST['author']:@$row['author'],
'CREATION_DATE_IMG'=>$date,
- 'KEYWORDS_IMG'=>isset($_POST['keywords'])?$_POST['keywords']:$row['keywords'],
- 'COMMENT_IMG'=>isset($_POST['comment'])?$_POST['comment']:$row['comment'],
+ 'KEYWORDS_IMG'=>isset($_POST['keywords'])?$_POST['keywords']:@$row['keywords'],
+ 'COMMENT_IMG'=>isset($_POST['comment'])?$_POST['comment']:@$row['comment'],
'ASSOCIATED_CATEGORIES'=>$categories,
'L_UPLOAD_NAME'=>$lang['upload_name'],