[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7174] property: more on uploader
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [7174] property: more on uploader |
Date: |
Mon, 04 Apr 2011 13:33:16 +0000 |
Revision: 7174
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7174
Author: sigurdne
Date: 2011-04-04 13:33:15 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
property: more on uploader
Modified Paths:
--------------
trunk/property/inc/class.fileuploader.inc.php
trunk/property/templates/base/config.tpl
Modified: trunk/property/inc/class.fileuploader.inc.php
===================================================================
--- trunk/property/inc/class.fileuploader.inc.php 2011-04-04 12:05:43 UTC
(rev 7173)
+++ trunk/property/inc/class.fileuploader.inc.php 2011-04-04 13:33:15 UTC
(rev 7174)
@@ -83,6 +83,19 @@
$ntlm_alternative_host =
isset($config->config_data['ntlm_alternative_host']) ?
$config->config_data['ntlm_alternative_host'] : '';
$scriptAccess = $ntlm_alternative_host ? 'always' :
'sameDomain';
+ $uploader_filetypes =
isset($config->config_data['uploader_filetypes']) ?
$config->config_data['uploader_filetypes'] : 'jpg,gif,png';
+ $uploader_filetypes_arr = explode(',',
$uploader_filetypes);
+
+
+ $filetypes = array();
+ foreach( $uploader_filetypes_arr as $filetype)
+ {
+ $filetypes[] = "*.{$filetype}";
+ }
+
+ $fileExt = implode(';',$filetypes);
+ $fileDesc = strtoupper(implode(', ',$filetypes));
+
$title = lang('fileuploader');
$version = 2;
if($version == 2)
@@ -112,8 +125,8 @@
//
'scriptAccess' : '{$scriptAccess}',//'sameDomain'|'always' Set to "always" to
allow script access across domains
'multi' : true,
'auto' : true,
-
'fileExt' : '*.jpg;*.gif;*.png',
-
'fileDesc' : 'Image Files (.JPG, .GIF, .PNG)',
+
'fileExt' : '{$fileExt}',
+
'fileDesc' : 'Files ({$fileDesc})',
'queueID' : 'queue',
'queueSizeLimit' : 50,
'simUploadLimit' : 50,
@@ -190,8 +203,8 @@
'method' : 'GET',
'multi' : true,
'auto' : true,
-
'fileTypeExts' : '*.jpg;*.gif;*.png',
-
'fileTypeDesc' : 'Image Files (.JPG, .GIF, .PNG)',
+
'fileTypeExts' : '{$fileExt}',
+
'fileTypeDesc' : 'Files ({$fileDesc})',
'queueID' : 'queue',
'queueSizeLimit' : 50,
'simUploadLimit' : 50,
Modified: trunk/property/templates/base/config.tpl
===================================================================
--- trunk/property/templates/base/config.tpl 2011-04-04 12:05:43 UTC (rev
7173)
+++ trunk/property/templates/base/config.tpl 2011-04-04 13:33:15 UTC (rev
7174)
@@ -470,6 +470,10 @@
<td>{lang_ntlm_alternative_host}:</td>
<td><input name="newsettings[ntlm_alternative_host]"
value="{value_ntlm_alternative_host}"></td>
</tr>
+ <tr class="row_on">
+ <td>{lang_uploader_filetypes}: jpg,gif,png</td>
+ <td><input name="newsettings[uploader_filetypes]"
value="{value_uploader_filetypes}"></td>
+ </tr>
<!--
groupnotification
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7174] property: more on uploader,
Sigurd Nes <=