From: garvinhicking Date: Sun, 31 Jul 2005 21:20:56 +0000 (+0000) Subject: Check image view permissions X-Git-Tag: 0.9~256 X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=6b5d27566d3556fadfd0f67aadf20face64f8879;p=s9y.git Check image view permissions --- diff --git a/docs/NEWS b/docs/NEWS index b76dac6..826cd6d 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,11 @@ Version 0.9 () ------------------------------------------------------------------------ + * Permissions: The permission "adminImagesViewOthers" now controls + whether an author is allowed to view images or not. In older Serendipity + versions, any author could always view any images, but only modify those + belonging to him. (garvinhicking) + * Plugin API: Added plugin hooks for category properties, made smarty init function accept plugin values. See the plugin "Properties for Categories" for example usage. The plugin allows to create sub-blogs diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php index 1a12e84..91d751e 100644 --- a/include/functions_config.inc.php +++ b/include/functions_config.inc.php @@ -592,6 +592,8 @@ function serendipity_getPermissionNames() { => array(USERLEVEL_ADMIN, USERLEVEL_CHIEF, USERLEVEL_EDITOR), 'adminImagesMaintainOthers' => array(USERLEVEL_ADMIN, USERLEVEL_CHIEF), + 'adminImagesViewOthers' + => array(USERLEVEL_ADMIN, USERLEVEL_CHIEF, USERLEVEL_EDITOR), 'adminImagesView' => array(USERLEVEL_ADMIN, USERLEVEL_CHIEF, USERLEVEL_EDITOR), 'adminImagesSync' diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index 193b89f..07157f4 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -40,6 +40,17 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order $directorysql .= " AND name like '%" . serendipity_db_escape_string($filename) . "%'"; } } + + $perm = $permsql = ''; + if (isset($serendipity['authorid']) && !serendipity_checkPermission('adminImagesViewOthers')) { + $perm = " (i.authorid = 0 OR i.authorid = " . (int)$serendipity['authorid'] . ")"; + if (empty($directorysql)) { + $directorysql = " WHERE $perm"; + } else { + $directorysql .= " AND $perm"; + } + $permsql = " WHERE $perm"; + } $query = "SELECT i.*, a.realname AS authorname FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a ON i.authorid = a.authorid $directorysql ORDER BY $order $ordermode $limitsql"; $rs = serendipity_db_query($query, false, 'assoc'); @@ -47,7 +58,7 @@ function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order return array(); } - $total_query = "SELECT count(i.id) FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a on i.authorid = a.authorid"; + $total_query = "SELECT count(i.id) FROM {$serendipity['dbPrefix']}images AS i LEFT OUTER JOIN {$serendipity['dbPrefix']}authors AS a on i.authorid = a.authorid $permsql"; $total_rs = serendipity_db_query($total_query, true, 'num'); if (is_array($total_rs)) { $total = $total_rs[0]; @@ -1022,6 +1033,11 @@ function serendipity_displayImageList($page = 0, $lineBreak = NULL, $manage = fa $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']; $is_image = serendipity_isImage($file); + if (!($serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0' || serendipity_checkPermission('adminImagesViewOthers'))) { + // This is a fail-safe continue. Basically a non-matching file should already be filtered in SQL. + continue; + } + /* If it is an image, and the thumbnail exists */ if ($is_image && file_exists($img)) { $preview .= ''. $file['name'] . ''; diff --git a/lang/serendipity_lang_bg.inc.php b/lang/serendipity_lang_bg.inc.php index b6fc0bb..570ec88 100644 --- a/lang/serendipity_lang_bg.inc.php +++ b/lang/serendipity_lang_bg.inc.php @@ -751,4 +751,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_cn.inc.php b/lang/serendipity_lang_cn.inc.php index f76a63a..d36f4c8 100644 --- a/lang/serendipity_lang_cn.inc.php +++ b/lang/serendipity_lang_cn.inc.php @@ -765,4 +765,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_cs.inc.php b/lang/serendipity_lang_cs.inc.php index 54342e7..cb6710a 100644 --- a/lang/serendipity_lang_cs.inc.php +++ b/lang/serendipity_lang_cs.inc.php @@ -767,4 +767,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_cz.inc.php b/lang/serendipity_lang_cz.inc.php index 7b12918..983b34b 100644 --- a/lang/serendipity_lang_cz.inc.php +++ b/lang/serendipity_lang_cz.inc.php @@ -767,4 +767,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_da.inc.php b/lang/serendipity_lang_da.inc.php index d5e90be..2ab9d3a 100644 --- a/lang/serendipity_lang_da.inc.php +++ b/lang/serendipity_lang_da.inc.php @@ -766,4 +766,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_de.inc.php b/lang/serendipity_lang_de.inc.php index 00e8d10..3d209ab 100644 --- a/lang/serendipity_lang_de.inc.php +++ b/lang/serendipity_lang_de.inc.php @@ -766,4 +766,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_en.inc.php b/lang/serendipity_lang_en.inc.php index c39b2fb..71d2ee3 100644 --- a/lang/serendipity_lang_en.inc.php +++ b/lang/serendipity_lang_en.inc.php @@ -764,4 +764,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Templates of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Templates of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_es.inc.php b/lang/serendipity_lang_es.inc.php index 93c753a..87facfa 100644 --- a/lang/serendipity_lang_es.inc.php +++ b/lang/serendipity_lang_es.inc.php @@ -770,4 +770,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_fa.inc.php b/lang/serendipity_lang_fa.inc.php index 9a47356..93e6491 100644 --- a/lang/serendipity_lang_fa.inc.php +++ b/lang/serendipity_lang_fa.inc.php @@ -766,4 +766,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_fi.inc.php b/lang/serendipity_lang_fi.inc.php index 129bcdf..dd77051 100644 --- a/lang/serendipity_lang_fi.inc.php +++ b/lang/serendipity_lang_fi.inc.php @@ -764,4 +764,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_fr.inc.php b/lang/serendipity_lang_fr.inc.php index 23b0b95..5d601bb 100644 --- a/lang/serendipity_lang_fr.inc.php +++ b/lang/serendipity_lang_fr.inc.php @@ -771,4 +771,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_hu.inc.php b/lang/serendipity_lang_hu.inc.php index df87c48..6c3373a 100644 --- a/lang/serendipity_lang_hu.inc.php +++ b/lang/serendipity_lang_hu.inc.php @@ -765,4 +765,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_is.inc.php b/lang/serendipity_lang_is.inc.php index 0173496..5a08f2a 100644 --- a/lang/serendipity_lang_is.inc.php +++ b/lang/serendipity_lang_is.inc.php @@ -764,4 +764,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_it.inc.php b/lang/serendipity_lang_it.inc.php index e6f719c..b044c28 100644 --- a/lang/serendipity_lang_it.inc.php +++ b/lang/serendipity_lang_it.inc.php @@ -766,4 +766,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_ja.inc.php b/lang/serendipity_lang_ja.inc.php index 1132b3a..ff0556f 100644 --- a/lang/serendipity_lang_ja.inc.php +++ b/lang/serendipity_lang_ja.inc.php @@ -766,4 +766,5 @@ Serendipity のアップグレードステージを無視しました。正し @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_ko.inc.php b/lang/serendipity_lang_ko.inc.php index bc7de2a..7c4e873 100644 --- a/lang/serendipity_lang_ko.inc.php +++ b/lang/serendipity_lang_ko.inc.php @@ -767,3 +767,5 @@ @define('CATEGORIES_PARENT_BASE_DESC', '하나의 상위 범주를 골라서 그 아래에 있는 범주만 보이도록 할 수 있습니다.'); @define('CATEGORIES_HIDE_PARALLEL', '범주 트리에 속하지 않는 범주 숨기기'); @define('CATEGORIES_HIDE_PARALLEL_DESC', '다른 범주 트리에 속해 있는 범주를 보이지 않게 하려면 이것을 사용하십시오. "범주의 속성/템플릿" 플러그인을 적용한 멀티-블로그와 함께 사용할 때 가장 의미가 있습니다.'); + +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_nl.inc.php b/lang/serendipity_lang_nl.inc.php index 35ce9d6..f3a4d11 100644 --- a/lang/serendipity_lang_nl.inc.php +++ b/lang/serendipity_lang_nl.inc.php @@ -768,4 +768,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_no.inc.php b/lang/serendipity_lang_no.inc.php index ab4d042..4ae19dd 100644 --- a/lang/serendipity_lang_no.inc.php +++ b/lang/serendipity_lang_no.inc.php @@ -767,4 +767,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_pt.inc.php b/lang/serendipity_lang_pt.inc.php index 062f806..f80dab0 100644 --- a/lang/serendipity_lang_pt.inc.php +++ b/lang/serendipity_lang_pt.inc.php @@ -767,4 +767,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_pt_PT.inc.php b/lang/serendipity_lang_pt_PT.inc.php index eb62820..0f313a9 100644 --- a/lang/serendipity_lang_pt_PT.inc.php +++ b/lang/serendipity_lang_pt_PT.inc.php @@ -768,4 +768,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_ro.inc.php b/lang/serendipity_lang_ro.inc.php index 88cc877..9d7990d 100644 --- a/lang/serendipity_lang_ro.inc.php +++ b/lang/serendipity_lang_ro.inc.php @@ -764,4 +764,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_ru.inc.php b/lang/serendipity_lang_ru.inc.php index 032e06f..af566c9 100644 --- a/lang/serendipity_lang_ru.inc.php +++ b/lang/serendipity_lang_ru.inc.php @@ -768,4 +768,5 @@ $i18n_filename_to = array('_', 'a', 'A', 'b', 'B', 'v', 'V', 'g', 'G', 'd', 'D @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_se.inc.php b/lang/serendipity_lang_se.inc.php index 1f204ae..2c48b03 100644 --- a/lang/serendipity_lang_se.inc.php +++ b/lang/serendipity_lang_se.inc.php @@ -766,4 +766,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_tn.inc.php b/lang/serendipity_lang_tn.inc.php index 97a1d5b..b21dec8 100644 --- a/lang/serendipity_lang_tn.inc.php +++ b/lang/serendipity_lang_tn.inc.php @@ -767,4 +767,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_tw.inc.php b/lang/serendipity_lang_tw.inc.php index d638162..6f4d554 100644 --- a/lang/serendipity_lang_tw.inc.php +++ b/lang/serendipity_lang_tw.inc.php @@ -767,4 +767,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files'); diff --git a/lang/serendipity_lang_zh.inc.php b/lang/serendipity_lang_zh.inc.php index 6677a64..c4324f3 100644 --- a/lang/serendipity_lang_zh.inc.php +++ b/lang/serendipity_lang_zh.inc.php @@ -765,4 +765,5 @@ @define('CATEGORIES_PARENT_BASE', 'Only show categories below...'); @define('CATEGORIES_PARENT_BASE_DESC', 'You can choose a parent category so that only the child categories are shown.'); @define('CATEGORIES_HIDE_PARALLEL', 'Hide categories that are not part of the category tree'); -@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); \ No newline at end of file +@define('CATEGORIES_HIDE_PARALLEL_DESC', 'If you want to hide categories that are part of a different category tree, you need to enable this. This feature makes most sense if used in conjunction with a multi-blog using the "Properties/Tempaltes of categories" plugin.'); +@define('PERMISSION_ADMINIMAGESVIEWOTHERS', 'adminImagesViewOthers: View other user\'s media files');