[Fmsystem-commits] [7176] property: more on uploader

[Sigurd Nes]

Revision: 7176
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7176
Author:   sigurdne
Date:     2011-04-04 13:42:50 +0000 (Mon, 04 Apr 2011)
Log Message:
-----------
property: more on uploader

Modified Paths:
--------------
    trunk/property/inc/class.fileuploader.inc.php

Modified: trunk/property/inc/class.fileuploader.inc.php
===================================================================
--- trunk/property/inc/class.fileuploader.inc.php       2011-04-04 13:34:40 UTC 
(rev 7175)
+++ trunk/property/inc/class.fileuploader.inc.php       2011-04-04 13:42:50 UTC 
(rev 7176)
@@ -332,7 +332,14 @@
                        }
                        $upload_name = "Filedata";
                        $max_file_size_in_bytes = 2147483647;                   
        // 2GB in bytes
-                       $extension_whitelist = array("jpg", "gif", "png");      
// Allowed file extensions
+
+                       $config = CreateObject('phpgwapi.config','property');
+                       $config->read();
+                       $uploader_filetypes = 
isset($config->config_data['uploader_filetypes']) ? 
$config->config_data['uploader_filetypes'] : 'jpg,gif,png';
+
+                       //$extension_whitelist = array("jpg", "gif", "png");    
// Allowed file extensions
+                       $extension_whitelist = explode(',', 
$uploader_filetypes); 
+                       
                        $valid_chars_regex = '.A-Z0-9_ 
address@hidden&()+={}\[\]\',~`-';                                // Characters 
allowed in the file name (in a Regular Expression format)
 
                        // Other variables