[Fmsystem-commits] [14967] file handling

[Sigurd Nes]

Revision: 14967
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14967
Author:   sigurdne
Date:     2016-05-03 10:38:03 +0000 (Tue, 03 May 2016)
Log Message:
-----------
file handling

Modified Paths:
--------------
    trunk/manual/inc/class.uidocuments.inc.php
    trunk/manual/templates/base/documents_add.xsl

Modified: trunk/manual/inc/class.uidocuments.inc.php
===================================================================
--- trunk/manual/inc/class.uidocuments.inc.php  2016-05-03 10:35:56 UTC (rev 
14966)
+++ trunk/manual/inc/class.uidocuments.inc.php  2016-05-03 10:38:03 UTC (rev 
14967)
@@ -142,9 +142,8 @@
 
                        $categories = $this->_get_categories($cat_id);
 
+                       self::message_set($this->receipt);
 
-                       $msgbox_data = 
$this->bocommon->msgbox_data($this->receipt);
-
                        $file_def = array
                                (
                                array('key' => 'file_name', 'label' => 
lang('Filename'), 'sortable' => false),
@@ -175,7 +174,6 @@
                        $data = array
                                (
                                'datatable_def' => $datatable_def,
-                               'msgbox_data' => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'categories' => array('options' => $categories),
                                'editable' => $mode == 'edit',
                                'multiple_uploader' => $mode == 'edit' ? true : 
'',
@@ -284,11 +282,6 @@
                                        'string' => "/manual/{$_cat_id}",
                                        'relatives' => array(RELATIVE_NONE)));
 
-                               foreach ($_files as &$_file)
-                               {
-                                       $_file['path'] = 
"{$_cat_id}/{$_file['name']}";
-                               }
-
                                $files = array_merge($files, $_files);
                        }
 
@@ -323,10 +316,9 @@
                        $values = array();
                        foreach ($out as $_entry)
                        {
-                               $values[] = array
-                                       (
-                                       'file_name' => "<a 
href='{$link_view_file}&amp;file_name={$_entry['path']}' target='_blank' 
title='{$lang_view}'>{$_entry['name']}</a>",
-                                       'delete_file' => "<input 
type='checkbox' name='file_action[]' value='{$_entry['name']}' 
title='$lang_delete'>",
+                               $values[] = array(
+                                       'file_name' => "<a 
href='{$link_view_file}&amp;file_id={$_entry['file_id']}' target='_blank' 
title='{$lang_view}'>{$_entry['name']}</a>",
+                                       'delete_file' => "<input 
type='checkbox' name='file_action[]' value='{$_entry['file_id']}' 
title='$lang_delete'>",
                                );
                        }
 
@@ -351,12 +343,7 @@
                        {
                                return lang('no access');
                        }
-
-                       $bofiles = CreateObject('property.bofiles', '/manual');
-
-                       $file_name = 
html_entity_decode(urldecode(phpgw::get_var('file_name')));
-                       $file = "{$bofiles->fakebase}/{$file_name}";
-                       $bofiles->view_file('', $file);
+                       ExecMethod('property.bofiles.get_file', 
phpgw::get_var('file_id', 'int'));
                }
 
                /**

Modified: trunk/manual/templates/base/documents_add.xsl
===================================================================
--- trunk/manual/templates/base/documents_add.xsl       2016-05-03 10:35:56 UTC 
(rev 14966)
+++ trunk/manual/templates/base/documents_add.xsl       2016-05-03 10:38:03 UTC 
(rev 14967)
@@ -9,18 +9,7 @@
                </xsl:variable>
 
                <form name="form" id="form" action="{$action_url}" 
method="post" ENCTYPE="multipart/form-data">
-                       <dl>
-                               <xsl:choose>
-                                       <xsl:when test="msgbox_data != ''">
-                                               <dt>
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </dt>
-                                       </xsl:when>
-                               </xsl:choose>
-                       </dl>
-
                        <div id="tab-content">
-
                                <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
 
                                <div id="documents">