From 3a4e4374dc3a788b5ccafa882da92421fd301866 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Tue, 29 Apr 2003 20:06:25 +0000 Subject: [PATCH] further work on the attachment panel... and see how plain those icons are... these are the correct ones to rip ;) Hopefully someone will make some nice upload icons. :) git-svn-id: file:///svn/phpbb/trunk@3959 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/admin_attachments.php | 532 +++++++++++++++++++++++-- phpBB/download.php | 12 +- phpBB/images/upload_icons/avi.gif | Bin 0 -> 271 bytes phpBB/images/upload_icons/bmp.gif | Bin 0 -> 279 bytes phpBB/images/upload_icons/doc.gif | Bin 0 -> 940 bytes phpBB/images/upload_icons/exe.gif | Bin 0 -> 1096 bytes phpBB/images/upload_icons/flash.gif | Bin 0 -> 254 bytes phpBB/images/upload_icons/gif.gif | Bin 0 -> 189 bytes phpBB/images/upload_icons/html.gif | Bin 0 -> 183 bytes phpBB/images/upload_icons/jpg.gif | Bin 0 -> 188 bytes phpBB/images/upload_icons/mid.gif | Bin 0 -> 141 bytes phpBB/images/upload_icons/mov.gif | Bin 0 -> 271 bytes phpBB/images/upload_icons/mp3.gif | Bin 0 -> 253 bytes phpBB/images/upload_icons/mpg.gif | Bin 0 -> 271 bytes phpBB/images/upload_icons/netscape.gif | Bin 0 -> 214 bytes phpBB/images/upload_icons/pdf.gif | Bin 0 -> 370 bytes phpBB/images/upload_icons/ppt.gif | Bin 0 -> 867 bytes phpBB/images/upload_icons/rar.gif | Bin 0 -> 976 bytes phpBB/images/upload_icons/txt.gif | Bin 0 -> 138 bytes phpBB/images/upload_icons/wav.gif | Bin 0 -> 162 bytes phpBB/images/upload_icons/xls.gif | Bin 0 -> 941 bytes phpBB/images/upload_icons/zip.gif | Bin 0 -> 155 bytes phpBB/language/en/lang_admin.php | 25 ++ phpBB/language/en/lang_main.php | 1 + phpBB/viewtopic.php | 2 +- 25 files changed, 539 insertions(+), 33 deletions(-) create mode 100644 phpBB/images/upload_icons/avi.gif create mode 100644 phpBB/images/upload_icons/bmp.gif create mode 100644 phpBB/images/upload_icons/doc.gif create mode 100644 phpBB/images/upload_icons/exe.gif create mode 100644 phpBB/images/upload_icons/flash.gif create mode 100644 phpBB/images/upload_icons/gif.gif create mode 100644 phpBB/images/upload_icons/html.gif create mode 100644 phpBB/images/upload_icons/jpg.gif create mode 100644 phpBB/images/upload_icons/mid.gif create mode 100644 phpBB/images/upload_icons/mov.gif create mode 100644 phpBB/images/upload_icons/mp3.gif create mode 100644 phpBB/images/upload_icons/mpg.gif create mode 100644 phpBB/images/upload_icons/netscape.gif create mode 100644 phpBB/images/upload_icons/pdf.gif create mode 100644 phpBB/images/upload_icons/ppt.gif create mode 100644 phpBB/images/upload_icons/rar.gif create mode 100644 phpBB/images/upload_icons/txt.gif create mode 100644 phpBB/images/upload_icons/wav.gif create mode 100644 phpBB/images/upload_icons/xls.gif create mode 100644 phpBB/images/upload_icons/zip.gif diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php index 39e1bb8c3f..a48c62fba7 100644 --- a/phpBB/adm/admin_attachments.php +++ b/phpBB/adm/admin_attachments.php @@ -121,7 +121,7 @@ while ($row = $db->sql_fetchrow($result)) if ($submit && ($mode == 'manage' || $mode == 'cats')) { - add_log('admin', 'LOG_SETTING_CONFIG'); + add_log('admin', 'LOG_ATTACH_CONFIG'); $notify = TRUE; $notify_msg = $user->lang['ATTACH_CONFIG_UPDATED']; } @@ -152,6 +152,9 @@ switch ($mode) case 'cats': $l_title = 'MANAGE_CATEGORIES'; break; + + case 'ext_groups': + $l_title = 'EXTENSION_GROUPS_TITLE'; } // Temporary Language Variables @@ -214,6 +217,162 @@ if ($submit && $mode == 'cats') test_upload($error, $error_msg, $upload_dir, $new['ftp_path'] . '/thumbs', $new['allow_ftp_upload'], true); } +if ($submit && $mode == 'ext_groups') +{ + // Change Extension Groups ? + $group_change_list = ( isset($_POST['group_change_list']) ) ? $_POST['group_change_list'] : array(); + $extension_group_list = ( isset($_POST['extension_group_list']) ) ? $_POST['extension_group_list'] : array(); + $group_allowed_list = ( isset($_POST['allowed_list']) ) ? $_POST['allowed_list'] : array(); + $download_mode_list = ( isset($_POST['download_mode_list']) ) ? $_POST['download_mode_list'] : array(); + $category_list = ( isset($_POST['category_list']) ) ? $_POST['category_list'] : array(); + $upload_icon_list = ( isset($_POST['upload_icon_list']) ) ? $_POST['upload_icon_list'] : array(); + $filesize_list = ( isset($_POST['max_filesize_list']) ) ? $_POST['max_filesize_list'] : array(); + $size_select_list = ( isset($_POST['size_select_list']) ) ? $_POST['size_select_list'] : array(); + + $allowed_list = array(); + + for ($i = 0; $i < count($group_allowed_list); $i++) + { + for ($j = 0; $j < count($group_change_list); $j++) + { + if ($group_allowed_list[$i] == $group_change_list[$j]) + { + $allowed_list[$j] = '1'; + } + } + } + + for ($i = 0; $i < count($group_change_list); $i++) + { + $allowed = ( isset($allowed_list[$i]) ) ? 1 : 0; + + $filesize_list[$i] = ( $size_select_list[$i] == 'kb' ) ? round($filesize_list[$i] * 1024) : ( ($size_select_list[$i] == 'mb') ? round($filesize_list[$i] * 1048576) : $filesize_list[$i] ); + + $group_sql = array( + 'group_name' => $extension_group_list[$i], + 'cat_id' => $category_list[$i], + 'allow_group' => $allowed, + 'download_mode' => $download_mode_list[$i], + 'upload_icon' => ($upload_icon_list[$i] == 'no_image') ? '' : $upload_icon_list[$i], + 'max_filesize' => $filesize_list[$i] + ); + + $sql = "UPDATE " . EXTENSION_GROUPS_TABLE . " SET " . $db->sql_build_array('UPDATE', $group_sql) . " WHERE group_id = " . $group_change_list[$i]; + $db->sql_query($sql); + } + + // Delete Extension Groups + $group_id_list = ( isset($_POST['group_id_list']) ) ? $_POST['group_id_list'] : array(); + + if (count($group_id_list)) + { + $l_group_list = ''; + + $sql = "SELECT group_name + FROM " . EXTENSION_GROUPS_TABLE . " + WHERE group_id IN (" . implode(', ', $group_id_list) . ")"; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + $l_group_list .= (($l_group_list != '') ? ', ' : '') . $row['group_name']; + } + $db->sql_freeresult($result); + + $sql = "DELETE + FROM " . EXTENSION_GROUPS_TABLE . " + WHERE group_id IN (" . implode(', ', $group_id_list) . ")"; + $db->sql_query($sql); + + // Set corresponding Extensions to a pending Group + $sql = "UPDATE " . EXTENSIONS_TABLE . " + SET group_id = 0 + WHERE group_id IN (" . implode(', ', $group_id_list) . ")"; + $db->sql_query($sql); + + add_log('admin', 'LOG_ATTACH_EXTGROUP_DEL', $l_group_list); + } + + // Add Extensions Group ? + $extension_group = ( isset($_POST['add_extension_group']) ) ? trim(strip_tags($_POST['add_extension_group'])) : ''; + $download_mode = ( isset($_POST['add_download_mode']) ) ? $_POST['add_download_mode'] : ''; + $cat_id = ( isset($_POST['add_category']) ) ? $_POST['add_category'] : ''; + $upload_icon = ( isset($_POST['add_upload_icon']) ) ? $_POST['add_upload_icon'] : ''; + $filesize = ( isset($_POST['add_max_filesize']) ) ? $_POST['add_max_filesize'] : ''; + $size_select = ( isset($_POST['add_size_select']) ) ? $_POST['add_size_select'] : ''; + $is_allowed = ( isset($_POST['add_allowed']) ) ? 1 : 0; + $add = ( isset($_POST['add_extension_group_check']) ) ? TRUE : FALSE; + + if ($extension_group != '' && $add) + { + // check Extension Group + $sql = "SELECT group_name + FROM " . EXTENSION_GROUPS_TABLE; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + if ($row['group_name'] == $extension_group) + { + $error = TRUE; + if (isset($error_msg)) + { + $error_msg .= '
'; + } + $error_msg .= sprintf($user->lang['EXTENSION_GROUP_EXIST'], $extension_group); + } + } + $db->sql_freeresult($result); + + if (!$error) + { + $filesize = ($size_select == 'kb') ? round($filesize * 1024) : (($size_select == 'mb') ? round($filesize * 1048576) : $filesize); + + $group_sql = array( + 'group_name' => $extension_group, + 'cat_id' => $cat_id, + 'allow_group' => $is_allowed, + 'download_mode' => $download_mode, + 'upload_icon' => ($upload_icon == 'no_image') ? '' : $upload_icon, + 'max_filesize' => $filesize + ); + + $sql = "INSERT INTO " . EXTENSION_GROUPS_TABLE . " " . $db->sql_build_array('INSERT', $group_sql); + $db->sql_query($sql); + + add_log('admin', 'LOG_ATTACH_EXTGROUP_ADD', $extension_group); + } + } + + $sql = "SELECT e.extension, g.* + FROM " . EXTENSIONS_TABLE . " e, " . EXTENSION_GROUPS_TABLE . " g + WHERE e.group_id = g.group_id + AND g.allow_group = 1"; + $result = $db->sql_query($sql); + + $extensions = array(); + while ($row = $db->sql_fetchrow($result)) + { + $extension = strtolower(trim($row['extension'])); + + $extensions['_allowed_'][] = $extension; + $extensions[$extension]['display_cat'] = intval($row['cat_id']); + $extensions[$extension]['download_mode'] = intval($row['download_mode']); + $extensions[$extension]['upload_icon'] = trim($row['upload_icon']); + $extensions[$extension]['max_filesize'] = intval($row['max_filesize']); + } + $db->sql_freeresult($result); + + $cache->destroy('extensions'); + $cache->put('extensions', $extensions); + + if (!$error) + { + $notify = true; + $notify_msg = $user->lang['EXTENSION_GROUPS_UPDATED']; + } +} + ?>

lang[$l_title]; ?>

@@ -242,7 +401,7 @@ else if ($notify)    - - -
- +      - - -
+ lang['BYTES'], $user->lang['KB'], $user->lang['MB']); - $size_types = array('b', 'kb', 'mb'); + $imglist = filelist($phpbb_root_path . $img_path, ''); - $select_field = ''; + $size = isset($_REQUEST['size']) ? intval($_REQUEST['size']) : 0; + + if (!$size && !$submit) + { + $max_add_filesize = intval($config['max_filesize']); + $size = ($max_add_filesize >= 1048576) ? 'mb' : ( ($max_add_filesize >= 1024) ? 'kb' : 'b' ); + } + + if ($max_add_filesize >= 1048576) + { + $max_add_filesize = round($max_add_filesize / 1048576 * 100) / 100; + } + else if ( $max_add_filesize >= 1024) + { + $max_add_filesize = round($max_add_filesize / 1024 * 100) / 100; + } + + $viewgroup = (!empty($_REQUEST['g'])) ? $_REQUEST['g'] : -1; +?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + // Format the filesize + if ($row['max_filesize'] == 0) + { + $row['max_filesize'] = intval($config['max_filesize']); + } + + $size_format = ($row['max_filesize'] >= 1048576) ? 'mb' : ( ($row['max_filesize'] >= 1024) ? 'kb' : 'b' ); + + if ($row['max_filesize'] >= 1048576) + { + $row['max_filesize'] = round($row['max_filesize'] / 1048576 * 100) / 100; + } + else if($row['max_filesize'] >= 1024) + { + $row['max_filesize'] = round($row['max_filesize'] / 1024 * 100) / 100; + } + + $s_allowed = ($row['allow_group'] == 1) ? 'checked="checked"' : ''; + $edit_img = ($row['upload_icon'] != '') ? $row['upload_icon'] : ''; + + $filename_list = ''; + $no_image_select = false; + foreach ($imglist as $img) + { + $img = substr($img['path'], 1) . (($img['path'] != '') ? '/' : '') . $img['file']; + + if ($edit_img == '') + { + $no_image_select = true; + $selected = ''; + } + else + { + $selected = ($edit_img == $img) ? ' selected="selected"' : ''; + } + + $filename_list .= ''; + } +?> + + + + + + + + + + +sql_query($sql); + + while ($e_row = $db->sql_fetchrow($e_result)) + { +?> + + + + + + + + +
lang['EXTENSION_GROUPS_TITLE']; ?>
 lang['EXTENSION_GROUP']; ?>  lang['SPECIAL_CATEGORY']; ?>  lang['ALLOWED']; ?>  lang['DOWNLOAD_MODE']; ?>  lang['UPLOAD_ICON']; ?>  lang['MAX_EXTGROUP_FILESIZE']; ?>  lang['ADD']; ?> 
+ + + + + +
 
+ 		   
 lang['EXTENSION_GROUP']; ?>  lang['SPECIAL_CATEGORY']; ?>  lang['ALLOWED']; ?>  lang['DOWNLOAD_MODE']; ?>  lang['UPLOAD_ICON']; ?>  lang['MAX_EXTGROUP_FILESIZE']; ?>  lang['DELETE']; ?> 
+ + + + + +
" class="gen">
+ 		/>    
  
+ + + + +
+ +lang['BYTES'], $user->lang['KB'], $user->lang['MB']); + $size_types = array('b', 'kb', 'mb'); + + $select_field = ''; + + return ($select_field); +} + +// Build Select for category items +function category_select($select_name, $group_id = -1) +{ + global $db, $user; + + $types = array( + NONE_CAT => $user->lang['NONE'], + IMAGE_CAT => $user->lang['CAT_IMAGES'], + WM_CAT => $user->lang['CAT_WM_FILES'], + RM_CAT => $user->lang['CAT_RM_FILES'] + ); + + if ($group_id != -1) + { + $sql = "SELECT cat_id + FROM " . EXTENSION_GROUPS_TABLE . " + WHERE group_id = " . intval($group_id); + $result = $db->sql_query($sql); + + if (!($row = $db->sql_fetchrow($result))) + { + $cat_type = NONE_CAT; + } + else + { + $cat_type = $row['cat_id']; + } + + $db->sql_freeresult($result); + } + else + { + $cat_type = NONE_CAT; + } + + $group_select = ''; + + return($group_select); +} + +// Build select for download modes + +function download_select($select_name, $group_id = -1) +{ + global $db, $user; + + $types = array( + INLINE_LINK => $user->lang['MODE_INLINE'], + PHYSICAL_LINK => $user->lang['MODE_PHYSICAL'] + ); + + if ($group_id != -1) + { + $sql = "SELECT download_mode + FROM " . EXTENSION_GROUPS_TABLE . " + WHERE group_id = " . intval($group_id); + $result = $db->sql_query($sql); + + if (!($row = $db->sql_fetchrow($result))) + { + $download_mode = INLINE_LINK; + } + else + { + $download_mode = $row['download_mode']; + } + + $db->sql_freeresult($result); + } + else + { + $download_mode = INLINE_LINK; + } + + $group_select = ''; + + return($group_select); +} + // Get supported Image types function get_supported_image_types() { @@ -657,4 +1114,31 @@ function get_supported_image_types() return ($types); } +function filelist($rootdir, $dir = '', $type = 'gif|jpg|png') +{ + static $images = array(); + + $dh = opendir($rootdir . $dir); + + while ($fname = readdir($dh)) + { + if (is_file($rootdir . $dir . '/' . $fname) && + preg_match('#\.' . $type . '$#i', $fname) && + filesize($rootdir . $dir . '/' . $fname)) + { + $images[] = array('path' => $dir, 'file' => $fname); + } + else if ($fname != '.' && $fname != '..' && + !is_file($rootdir . $dir . '/' . $fname) && + !is_link($rootdir . $dir . '/' . $fname)) + { + filelist($rootdir, $dir . '/'. $fname, $type); + } + } + + closedir($dh); + + return $images; +} + ?> \ No newline at end of file diff --git a/phpBB/download.php b/phpBB/download.php index a41b040c4e..42753a5d11 100644 --- a/phpBB/download.php +++ b/phpBB/download.php @@ -198,16 +198,12 @@ function send_file_to_browser($real_filename, $mimetype, $physical_filename, $up header('Content-Transfer-Encoding: none'); // Send out the Headers - if ($browser_agent == 'ie') - { - header('Content-Type: ' . $mimetype); - header('Content-Disposition: inline; filename="' . $real_filename . '"'); - } - else - { + header('Content-Type: ' . $mimetype . '; name="' . $real_filename . '"'); + header('Content-Disposition: inline; filename="' . $real_filename . '"'); +/* header('Content-Type: ' . $mimetype . '; name="' . $real_filename . '"'); header('Content-Disposition: attachment; filename=' . $real_filename); - } +*/ // Now send the File Contents to the Browser if ($gotit) diff --git a/phpBB/images/upload_icons/avi.gif b/phpBB/images/upload_icons/avi.gif new file mode 100644 index 0000000000000000000000000000000000000000..55f2116261790454ca65d5bbeea02aa91679cd02 GIT binary patch literal 271 zcmZ?wbhEHb6k!lyI3mZ8kTBoCAR!^){Q3C?^XH%c@Zp0&!upS9BP}F!UZ;61mvZ_GlkN0Vjjlft!fp0YuJ!me@770a zt}f4I5>I6jjH!!vm1<^Tm31}j$PwVTT7$|CqKia zIu>rB#1v+|cEc%C+1PaTLya?)1Zw!j-BuKu^OoCkuc%qJ+|qi@l3KON`}R+2YEopd F1^`O(UmpMf literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/doc.gif b/phpBB/images/upload_icons/doc.gif new file mode 100644 index 0000000000000000000000000000000000000000..078d9f7a14ae12ac13f99fe1279fac7ff320de26 GIT binary patch literal 940 zcmchWze|^K5XbLJ4mQ}LNN7vokl`R6L}fuOrWiz-LUo4k zXoM6km3z2_Yq*pOn&x2^reRW|m{kw8Pz@C{vKrzc7NQ}rq8cznqY_#4AO;&~uvnHd zR5j1s)m_RTv{Ytp>Lz6u6*Sdc)m3nhC}v&EMP0B*9>`>yIPi}M9HJU9M5B^XbU+L? z&|pa=S8ZyZnn?wTKWM2`O@&;siwc@1YC?`AO#tX(oS<<_l;nX-wuu8x7{(#00YfyK z$U+CiU;{06qMD{n%@Zz0kobd^N~J!I%C)(7HJcMw%*|D5wh6jYZ?db^CXPBn1c_3m!V>;e?mHM%gdd6#@nl} z7CXD=X5O}EUtj(vQ{j`yc8R!q_2#pCj~?B=fBDRf)4T5--G8RJzGM5Q zV_P>I+rH`ewvDIPuR670)?r2}}K{VoH;e+Gu9 z3=BZV9R`Lg3=EeT7>+P7Y-3=U&%od=Ep=Z){Ir6?e3~f(q%AaRCI_ZjwGiYcCnVTymCx=g-+%aiV`?P7@ zh6XYo?xu+efr|26j&>?0M)K~iCJW|Ib8*xT4R%h94@^xCO-TyT)0S|y*RZzG@^Cfv z_puG~cZdx0=xnd;?`>vfVQ{wBcXu|*OpDCRj<2rBId=4*r>j{)v}b6bb4Y+wMQK(| zWuAw#k*AAse3WNhbzx#`U~+tLT2fd_LP%z6WJXFvVQ$j4E$hMpU8YZLx_RYzYC>pR zQ|00XGlP8{L;am|GvcB{y}aD)TN)~-Oz50Cu`4djGdVVR#>6&9OWlI3#Qe;J)r+Q1 zpU{>ZY+F{4QIeNdRg$xE@$C3e&)&A$Y5i@J`#N4fxxI18w3fQ^H&5^OcQmeCG<(CU zB@1RxJ9+Hzq@MPr3+Bw9Id#^Q2@7UTo6^&(-r{Hf`Uq;nL~T5AWQ0eE&Yfpa+USSr|c%)BzEoJmJ9cpMjA> z#$&^RgSI<5CjN4M9V#MhmUoAtP*Hex6Nenbj13;b2VD~G_!uS!Brti{)*Oi7RCZ%` z%jIf|nCQgX$vTNoP$JDI!jN$no1rGBqGao0cW#C3rN8J|F z=_Wqbn6eKygxLLNDmY15E^IXG)XKJ&RsG|yB=uf-XZhoi&1zLJd6zP4a117APjWu$U}!Sy*&HAz;0eH(QlMq z2PkL=lm*fZ|G@yrAQCA4WMO1r5MF-UYo0&harQ>T$_7>@njEeP7|Z3xu#lri_J8bEngw1 H$Y2csmZD3t literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/gif.gif b/phpBB/images/upload_icons/gif.gif new file mode 100644 index 0000000000000000000000000000000000000000..5aa8d463e75b45184fea98cc67690eecc670d5f8 GIT binary patch literal 189 zcmZ?wbhEHb6k!ly*!-UX2>$>0&+vnRp`M|>o&hLO&%kitz=8ey_tyjY7(nqS3nK#q zJA)2L24scV<6Bs1ILVL9gBx0^7 WxHWlJ$;7Qb1H+Uk_w695`@b|Ni|T4mP0plZBCifsH{2BndLZ zfhFa_3D4D2n?(c<2{?<(97tuzShYw^X`g#TL<>WWlU!Fy_n!mvGn<%ME#}I#7W{Y< zcXE>JgQibQ4zDTmUg^ZYd7=6Bz*r+`Ssv?)PwpMdXmvOsJL{uh^r67Yr{Wyt%`ILr J?d^gL)&QM1KvDnz literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/jpg.gif b/phpBB/images/upload_icons/jpg.gif new file mode 100644 index 0000000000000000000000000000000000000000..537de1c3a0b69f5113c2e05db2fe4d6f8c4c16d2 GIT binary patch literal 188 zcmZ?wbhEHb6k!ly*!-UX2>$;7Qb1H+Uk|1j7!Djbuz&x45FZ05{$ycfU|?s^0m*>O zaA3*&aKdx-R81D9uIEh#F`P;BG?*qt-Bxl`>I~UdDkZ)m<1y;AY=+`kCHp@9-Qg|HcUnJYk`}cM^82JLuME6`hq< PRUsPL6&W8d$Y2csOf^5D literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/mid.gif b/phpBB/images/upload_icons/mid.gif new file mode 100644 index 0000000000000000000000000000000000000000..ea7302cb16e099c6c65a5e53105caa2f13eaa2aa GIT binary patch literal 141 zcmZ?wbhEHb6k!lySoEI(2~lR~uvFoJ=%L-mXQ{?HedGyr;9SLO<*IXjxsdOxs#JqG&-KU7K7Vwz?}SRq q6Qj9px||7FDGrgl7F^wQDs1}B`+7%u`>M}8YCe@$Ked;I!5RSWfH>>` literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/mov.gif b/phpBB/images/upload_icons/mov.gif new file mode 100644 index 0000000000000000000000000000000000000000..55f2116261790454ca65d5bbeea02aa91679cd02 GIT binary patch literal 271 zcmZ?wbhEHb6k!lyI3mZ8kTBoCAR!^){Q3C?^XH%c@Zp0&!upS9BP}F!UZ;61mvZ_GlkN0Vjjlft!fp0YuJ!me@770a zt}f4I5>I6jjH!!vm1<^Tm31}j$PwVpS9BP}F!UZ;61mvZ_GlkN0Vjjlft!fp0YuJ!me@770a zt}f4I5>I6jjH!!vm1<^Tm31}j$PwVE{$ycfVBloX0f~al zU|?xBIO(~1?+w1q){Zed0%a~qHc1MxJMkXhzLCRl`BX=d`+X*$AMDa%IQX8!g6rOU3D&^VOnk{z+fF#L9b;!SO;<5C pOihVs5pD}NVbO_IG2t}Tl<({2H0X9}@lcsHNpi{3Wg>zM)&MS7MRNcE literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/pdf.gif b/phpBB/images/upload_icons/pdf.gif new file mode 100644 index 0000000000000000000000000000000000000000..8d0603ae654c1c5a04ef7373d8e2d1edcdc2d1f6 GIT binary patch literal 370 zcmZ?wbhEHb6k!lyxT?T#|Neaj1_l8Ef&W0j!0^Dq;lcX#5BmEhBqZ)Xc<>-U|AD{% z{qyG^Y}oK%{`~tFF1)w5e-IG=J|N(Mfx-Lucur2v2OIXkckq9pum8Z_;X!=-gNB9& z_4N-53LYdRJlMYqMEQ|~c3Jf|R3qXEiVC#37P~f2>)!&@*$%DsYzJFsv zKnNSd4V^Ftj)3+H8-x$2D(qXpka#vNesMDz&fy*|#oENcFVE=4EXu{r fvyFjsS16;GBmPM+R#ERg!Bm literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/ppt.gif b/phpBB/images/upload_icons/ppt.gif new file mode 100644 index 0000000000000000000000000000000000000000..a3800d12c69e3a307fa01e58e0726f0e5dc8990c GIT binary patch literal 867 zcmeIxv1=DG6u|K;O2!l%uGl4;C%@(F(xZ#~5d9gK@)pb4rTtBEW5#TH1u2J9#tu5% zc;FH`Whj+U9j;pjkqm|M#^980@qYh?_~pan%@5wI*Dv?#V@4QBgwV33rKD9)>yZji zMPRjN%h@>-BNLW^WzEEz$kwq~4uzPRLf8UK0rPYP_+sq~8MqiZ%nS$1VdCIr&mvWtT*sghrtgfCX>>9%KNM+RnD!Bzq_O zNop^3kQ(JV$}uXiN(QC98c+>MnWU!Njkzphj;;^* z=)b>siMYRc+gf0># zk|m);gV66db14#3=m$khQ-d^J&wZi)pj*E0ad*!>&vT!*t9#F`wv*MU#u^YA9$^t0 zArZ*TJ>0@IT*8q>^Dqn3FbPBUs)t&rhDs=MR6N8&G(E8eJQho1qE=1mA}0|zOk~ebpBe^*2>nAQ(rDzuQ~K<^vUDF$x;dJe*yh$s2KnN literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/txt.gif b/phpBB/images/upload_icons/txt.gif new file mode 100644 index 0000000000000000000000000000000000000000..cc3639b89ce72ebc591881b82cc787d1b797c858 GIT binary patch literal 138 zcmZ?wbhEHb6k!lySoEI(2>$>0f8fA@{rmUV*VlviV4(Pug^_`Qi9rX%1F3aj_Se{T zXP?RmPxgwG7iV?(7&O|RxX-<(JVAK{*Tu+KKOOJP$>0&+vnRp`PKufdl*Z@2{_~2MQ|wWMO1rU}4Y!sQ{^U zU{3egb;mE6h0)8v`~{Pop{qvU-R8`U1W7rAfSW6)^(EflzTIQ$o{KCE2NXCM7z}Tp zNw!c5_MThfmHQ)rb=ov|)ss9A%C2*aF6Pr;S60WB M(Bc;w#K~X{0GpyZ=l}o! literal 0 HcmV?d00001 diff --git a/phpBB/images/upload_icons/xls.gif b/phpBB/images/upload_icons/xls.gif new file mode 100644 index 0000000000000000000000000000000000000000..187a19b53c3ff8f46ded3daa7ed2ef5ed87758cc GIT binary patch literal 941 zcmchWze|^K5Xa9lP=caziChwcgofxavS?^AzZFDD6f|jekkt@4v=m=*%6=?Sa^R5B zP%b&u&|(r4afG!KO$K#GCk8WHB+jJ z$nXry&Yfsz$1(TB@cBNGXxxDVCxs6kr1l7RyXa@znDO zi_i!uS}ON&3)gTd6*SGmEKI|sL@}!#YM~k`Xk<0SLo7r?U_~`xh(;x{=s^rN&|tAF zWvFVNxvRUBKWM4U+|*6VE-GlMxvHz+9#PD?n2Wk#k35jcHgVt|5jaFOV2DN~qv(Jb zY@orCO0L?}JT;RF5`WNAshSG8Viy%OP1J-ONtyuA#W+FZmMF;snQRjWnlOw*R0D=+ zHj#x6h`|P0>O?h7o0=zFj3Ds`EtN`r9F=Qx?`k$DteBgt)NB)UrQT#$t4$nrgvMbZ zHKOY#jgA6tp!poQ65-(qDrvWumX_M>HlJga|Lg7k+u0$qCi{x8{t4-tkvHAFBa2Vp zO?T~>y!df(Z29_k8JXLAW^HhK^}va^`C$D0z0Ox(o;|)X@!@Xou`NBVuj8+0_jgQ; z4lMS!9)9cpIk$8Bu7gijZ!fR6bkEAwq067153TfloU#6-|6YmOTX^VoV#*% n;rwR1HSp-#g*)2@7LKk>y;z$)wdwHS(oRgLH%t&MSo5y4=>DyDU#ri}n 'Altered email settings', 'LOG_AVATAR_CONFIG' => 'Altered avatar settings', 'LOG_AUTH_CONFIG' => 'Altered authentication settings', + 'LOG_ATTACH_CONFIG' => 'Altered attachment settings', 'log_prune_user_deac' => 'Users Deactivated
%s', 'log_prune_user_del_del'=> 'Users Pruned and Posts Deleted
%s', 'log_prune_user_del_anon'=> 'Users Pruned and Posts Retained
%s', @@ -142,6 +143,10 @@ $lang = array_merge($lang, array( 'LOG_ACL_GROUP_ADD' => 'Edited Group permissions
» %s', 'LOG_ACL_PRESET_ADD' => 'Added or edited permission preset
» %s', 'LOG_ACL_PRESET_DEL' => 'Deleted permission preset
» %s', + 'LOG_ATTACH_EXT_ADD' => 'Added or edited attachment extension
» %s', + 'LOG_ATTACH_EXT_DEL' => 'Removed attachment extension
» %s', + 'LOG_ATTACH_EXTGROUP_ADD' => 'Added or edited extension group
» %s', + 'LOG_ATTACH_EXTGROUP_DEL' => 'Removed extension group
» %s', 'RUN_HOW' => 'When to run', 'RUN_AS_NOW'=> 'Run now', @@ -882,6 +887,7 @@ $lang = array_merge($lang, array( 'ATTACH_MANAGE_URL' => 'Configuration', 'ATTACH_CATS_URL' => 'Special Categories', 'ATTACH_EXTENSIONS_URL' => 'Extensions', + 'ATTACH_EXT_GROUPS_URL' => 'Extension Groups', 'ATTACHMENT_SETTINGS' => 'Attachment Settings', 'ATTACHMENT_CONFIG_EXPLAIN' => 'Here you can configure the Main Settings for Attachments and the associated Special Categories.', @@ -947,6 +953,25 @@ $lang = array_merge($lang, array( 'IMAGE_LINK_SIZE' => 'Image Link Dimensions', 'IMAGE_LINK_SIZE_EXPLAIN' => 'If this defined Dimension of an Image is reached, the Image will be displayed as a Link, rather than displaying it inlined,
if Inline View is enabled (Width x Height in pixels).
If it is set to 0x0, this feature is disabled. With some Images this Feature will not work due to limitations in PHP.', + 'EXTENSION_GROUPS_TITLE' => 'Manage Extension Groups', + 'EXTENSION_GROUPS_TITLE_EXPLAIN' => 'Here you can add, delete and modify your Extension Groups, you can disable Extension Groups, assign a special Category to them, change the download mechanism and you can define an Upload Icon which will be displayed in front of an Attachment belonging to the Group.', + 'EXTENSION_GROUPS' => 'Extension groups', + 'EXTENSION_GROUP' => 'Extension group', + 'SPECIAL_CATEGORY' => 'Special category', + 'DOWNLOAD_MODE' => 'Download mode', + 'UPLOAD_ICON' => 'Upload icon', + 'MAX_EXTGROUP_FILESIZE' => 'Maximum filesize', + 'ADD_EXTGROUP' => 'Add extension group', + + 'CAT_IMAGES' => 'Images', + 'CAT_WM_FILES' => 'Win Media Streams', + 'CAT_RM_FILES' => 'Real Media Streams', + 'MODE_INLINE' => 'Inline', + 'MODE_PHYSICAL' => 'Physical', + 'NO_IMAGE' => 'No Image', + 'EXTENSION_GROUPS_UPDATED' => 'Extension Groups updated successfully', + 'EXTENSION_GROUP_EXIST' => 'The Extension Group %s already exist', + 'WELCOME_INSTALL' => 'Welcome to phpBB 2 Installation', 'INITIAL_CONFIG' => 'Basic Configuration', diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index a0727dc6ef..d835fb1b45 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -486,6 +486,7 @@ $lang = array( 'ATTACHMENT_PHP_SIZE_NA'=> 'The Attachment is too big.
Couldn\'t get the maximum Size defined in PHP.
The Attachment Mod is unable to determine the maximum Upload Size defined in the php.ini file.', 'ATTACHMENT_PHP_SIZE_OVERRUN' => 'The Attachment is too big.
Maximum Upload Size: %d MB.
Please note that this Size is defined in php.ini, this means it\'s set by PHP and the Attachment Mod can not override this value.', 'DISALLOWED_EXTENSION' => 'The Extension %s is not allowed', + 'ALLOWED' => 'Allowed', 'BYTES' => 'Bytes', 'KB' => 'KB', 'MB' => 'MB', diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index d2cfb2d09e..df06dc22f5 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1131,7 +1131,7 @@ foreach ($rowset as $key => $row) } else if (trim($extensions[$attachment['extension']]['upload_icon']) != '') { - $upload_image = ''; + $upload_image = ''; } $filesize = $attachment['filesize'];