aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorz0rglub <z0rglub@piwigo.org>2004-08-05 17:38:14 +0000
committerz0rglub <z0rglub@piwigo.org>2004-08-05 17:38:14 +0000
commitcedd2515b6b21404a419c1381a58b634b38aa304 (patch)
tree2da686a93e81d8e6f3a30b255bb7407d87e4c21e
parent011d68c4d63f5cab39862f05ff1ae9b799e11df3 (diff)
non picture files management
git-svn-id: http://piwigo.org/svn/trunk@470 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/category_calendar.inc.php58
-rw-r--r--include/category_default.inc.php15
-rw-r--r--include/category_recent_cats.inc.php14
-rw-r--r--include/category_subcats.inc.php14
-rw-r--r--language/en_UK.iso-8859-1/common.lang.php2
5 files changed, 81 insertions, 22 deletions
diff --git a/include/category_calendar.inc.php b/include/category_calendar.inc.php
index 0c44c5ea8..6ce68f31d 100644
--- a/include/category_calendar.inc.php
+++ b/include/category_calendar.inc.php
@@ -234,9 +234,17 @@ SELECT file,tn_ext,date_available,storage_category_id
$file = get_filename_wo_extension($row['file']);
// creating links for thumbnail and associated category
- $thumbnail_link = get_complete_dir($row['storage_category_id']);
- $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+ {
+ $thumbnail_link = get_complete_dir($row['storage_category_id']);
+ $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
+ $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ }
+ else
+ {
+ $thumbnail_link = './template/'.$user['template'].'/mimetypes/';
+ $thumbnail_link.= strtolower(get_extension($row['file'])).'.png';
+ }
$name = $calendar_year.' ('.$nb_pics.')';
@@ -284,11 +292,19 @@ SELECT file,tn_ext,date_available,storage_category_id
$row = mysql_fetch_array(mysql_query($query));
$file = get_filename_wo_extension($row['file']);
-
+
// creating links for thumbnail and associated category
- $thumbnail_link = get_complete_dir($row['storage_category_id']);
- $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+ {
+ $thumbnail_link = get_complete_dir($row['storage_category_id']);
+ $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
+ $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ }
+ else
+ {
+ $thumbnail_link = './template/'.$user['template'].'/mimetypes/';
+ $thumbnail_link.= strtolower(get_extension($row['file'])).'.png';
+ }
$name = $lang['month'][$calendar_month];
$name.= ' '.$page['calendar_year'];
@@ -344,9 +360,17 @@ SELECT file,tn_ext,date_available,storage_category_id
$file = get_filename_wo_extension($row['file']);
// creating links for thumbnail and associated category
- $thumbnail_link = get_complete_dir($row['storage_category_id']);
- $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+ {
+ $thumbnail_link = get_complete_dir($row['storage_category_id']);
+ $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
+ $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ }
+ else
+ {
+ $thumbnail_link = './template/'.$user['template'].'/mimetypes/';
+ $thumbnail_link.= strtolower(get_extension($row['file'])).'.png';
+ }
list($year,$month,$day) = explode('-', $calendar_day);
$unixdate = mktime(0,0,0,$month,$day,$year);
@@ -416,9 +440,17 @@ SELECT file,tn_ext,date_available,storage_category_id
$file = get_filename_wo_extension($row['file']);
// creating links for thumbnail and associated category
- $thumbnail_link = get_complete_dir($row['storage_category_id']);
- $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+ {
+ $thumbnail_link = get_complete_dir($row['storage_category_id']);
+ $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
+ $thumbnail_link.= $file.'.'.$row['tn_ext'];
+ }
+ else
+ {
+ $thumbnail_link = './template/'.$user['template'].'/mimetypes/';
+ $thumbnail_link.= strtolower(get_extension($row['file'])).'.png';
+ }
$thumbnail_title = $lang['calendar_picture_hint'].$name;
diff --git a/include/category_default.inc.php b/include/category_default.inc.php
index 5c8023f73..c7069ae9e 100644
--- a/include/category_default.inc.php
+++ b/include/category_default.inc.php
@@ -85,9 +85,18 @@ while ($row = mysql_fetch_array($result))
$name = replace_search($name, $_GET['search']);
}
// thumbnail url
- $thumbnail_url = $cat_directory;
- $thumbnail_url.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_url.= $file.'.'.$row['tn_ext'];
+ if (isset($row['tn_ext']) and $row['tn_ext'] != '')
+ {
+ $thumbnail_url = $cat_directory;
+ $thumbnail_url.= 'thumbnail/'.$conf['prefix_thumbnail'];
+ $thumbnail_url.= $file.'.'.$row['tn_ext'];
+ }
+ else
+ {
+ $thumbnail_url = './template/'.$user['template'].'/mimetypes/';
+ $thumbnail_url.= strtolower(get_extension($row['file'])).'.png';
+ }
+
// message in title for the thumbnail
$thumbnail_title = $row['file'];
if ($row['filesize'] == '')
diff --git a/include/category_recent_cats.inc.php b/include/category_recent_cats.inc.php
index c91a738fa..283d15ec6 100644
--- a/include/category_recent_cats.inc.php
+++ b/include/category_recent_cats.inc.php
@@ -80,9 +80,17 @@ SELECT id,file,tn_ext,storage_category_id
$file = get_filename_wo_extension( $subrow['file'] );
// creating links for thumbnail and associated category
- $thumbnail_link = get_complete_dir( $subrow['storage_category_id'] );
- $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_link.= $file.'.'.$subrow['tn_ext'];
+ if (isset($subrow['tn_ext']) and $subrow['tn_ext'] != '')
+ {
+ $thumbnail_link = get_complete_dir($subrow['storage_category_id']);
+ $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
+ $thumbnail_link.= $file.'.'.$subrow['tn_ext'];
+ }
+ else
+ {
+ $thumbnail_link = './template/'.$user['template'].'/mimetypes/';
+ $thumbnail_link.= strtolower(get_extension($subrow['file'])).'.png';
+ }
$url_link = PHPWG_ROOT_PATH.'category.php?cat='.$row['category_id'];
diff --git a/include/category_subcats.inc.php b/include/category_subcats.inc.php
index cf63d7e1f..a7791a5a2 100644
--- a/include/category_subcats.inc.php
+++ b/include/category_subcats.inc.php
@@ -89,9 +89,17 @@ SELECT file,tn_ext,storage_category_id
$file = get_filename_wo_extension($image_row['file']);
// creating links for thumbnail and associated category
- $thumbnail_link = get_complete_dir($image_row['storage_category_id']);
- $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
- $thumbnail_link.= $file.'.'.$image_row['tn_ext'];
+ if (isset($image_row['tn_ext']) and $image_row['tn_ext'] != '')
+ {
+ $thumbnail_link = get_complete_dir($image_row['storage_category_id']);
+ $thumbnail_link.= 'thumbnail/'.$conf['prefix_thumbnail'];
+ $thumbnail_link.= $file.'.'.$image_row['tn_ext'];
+ }
+ else
+ {
+ $thumbnail_link = './template/'.$user['template'].'/mimetypes/';
+ $thumbnail_link.= strtolower(get_extension($image_row['file'])).'.png';
+ }
$thumbnail_title = $lang['hint_category'];
diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 3466de6e7..9feac861f 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -229,6 +229,8 @@ $lang['customize_year'] = 'year';
$lang['slideshow'] = 'slideshow';
$lang['period_seconds'] = 'seconds per picture';
$lang['slideshow_stop'] = 'stop the slideshow';
+$lang['download'] = 'download';
+$lang['download_hint'] = 'download this file';
$lang['comment_added'] = 'Your comment has been registered';
$lang['comment_to_validate'] = 'An administrator must authorize your comment before it is visible.';
$lang['comment_anti-flood'] = 'Anti-flood system : please wait for a moment before trying to post another comment';