[Fmsystem-commits] [6645] Property: multiuploader

[Sigurd Nes]

Revision: 6645
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6645
Author:   sigurdne
Date:     2010-11-26 09:31:24 +0000 (Fri, 26 Nov 2010)
Log Message:
-----------
Property: multiuploader

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

Modified: trunk/property/inc/class.fileuploader.inc.php
===================================================================
--- trunk/property/inc/class.fileuploader.inc.php       2010-11-26 07:37:56 UTC 
(rev 6644)
+++ trunk/property/inc/class.fileuploader.inc.php       2010-11-26 09:31:24 UTC 
(rev 6645)
@@ -141,7 +141,13 @@
                static function get_js($oArgs = '')
                {
                        $button_text = lang('Select Files');
-                       $str_base_url = $GLOBALS['phpgw']->link('/', array(), 
true);
+                       $str_base_url = 'http';
+                       $str_base_url .= phpgw::get_var('HTTPS', 'bool', 
'SERVER') ? 's' : '' ;
+                       $str_base_url .= '://';
+                       $str_base_url .= phpgw::get_var('HTTP_HOST', 'string', 
'SERVER');
+//_debug_array($str_base_server);
+
+                       $str_base_url .= $GLOBALS['phpgw']->link('/', array(), 
true);
                        $js_code = <<<JS
 <script type="text/javascript">
                var swfu;
@@ -149,7 +155,6 @@
 
                var sUrl = phpGWLink('index.php', $oArgs);
 
-
                window.onload = function() {
                        var settings = {
                                flash_url : 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/js/swfupload/swfupload.swf",
@@ -165,7 +170,7 @@
                                        progressTarget : "fsUploadProgress",
                                        cancelButtonId : "btnCancel"
                                },
-                               debug: false,
+                               debug: true,
 
                                // Button settings
                                button_image_url: 
"images/TestImageNoText_65x29.png",
@@ -252,7 +257,7 @@
                        }
 
                // Settings
-                       $save_path = dirname(__FILENAME__) . "/uploads/";       
// The path were we will save the file (getcwd() may not be reliable and should 
be tested in your environment)
+               //      $save_path = dirname(__FILENAME__) . "/uploads/";       
// The path were we will save the file (getcwd() may not be reliable and should 
be tested in your environment)
                        $save_path = 
"{$GLOBALS['phpgw_info']['server']['temp_dir']}/";
                        $upload_name = "Filedata";
                        $max_file_size_in_bytes = 2147483647;                   
        // 2GB in bytes