[Fmsystem-commits] [7084] Merge 7082:7083 from trunk

[Sigurd Nes]

Revision: 7084
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7084
Author:   sigurdne
Date:     2011-03-08 12:50:05 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
Merge 7082:7083 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/frontend/inc/class.uidocumentupload.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083

Modified: 
branches/Version-1_0-branch/frontend/inc/class.uidocumentupload.inc.php
===================================================================
--- branches/Version-1_0-branch/frontend/inc/class.uidocumentupload.inc.php     
2011-03-08 12:49:15 UTC (rev 7083)
+++ branches/Version-1_0-branch/frontend/inc/class.uidocumentupload.inc.php     
2011-03-08 12:50:05 UTC (rev 7084)
@@ -90,8 +90,20 @@
                                return;
                        }
                }
+
+               $mime_magic = createObject('phpgwapi.mime_magic');
                
-               $file_path = $path."/{$file['name']}";
+               $mime       = $mime_magic->filename2mime($file['name']);
+
+               if( $mime != 'application/pdf' )
+               {
+                       $message ='Only PDF is supported for this one';
+                       phpgwapi_cache::message_set($message, 'error');
+                       return $message;                
+               }
+
+               $file_path = "{$path}/helpdesk.index.pdf";
+
                $result = $vfs->write
                (
                        array
@@ -101,24 +113,14 @@
                                'content' => 
file_get_contents($file['tmp_name'])
                        )
                );
+
                if($result)
                {
-                       return "Stored in vfs";
+                       $message ='Stored in vfs';
+                       phpgwapi_cache::message_set($message, 'message');
+                       return $message;
                }
                return "something failed...";
-
-/*             
-               if (file_exists("/u01/filer/bkb_data/frontend/upload/" . 
$file['name']))
-               {
-                       return $file["name"] . " already exists. ";
-               }
-               else
-               {
-                       
move_uploaded_file($file["tmp_name"],"/u01/filer/bkb_data/frontend/upload/" . 
$file["name"]);
-                       return "Stored in: " . 
"/u01/filer/bkb_data/frontend/upload/" . $file["name"] . ' (temp: '. 
$file['tmp_name']. ')';
-               }
-               //return "file stored";
-*/
        }
        
        public function get_id_field_name($extended_info = false)
@@ -236,7 +238,6 @@
        
        public function read_helpfile_from_vfs()
        {
-               
                $GLOBALS['phpgw_info']['flags']['noheader'] = true;
                $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
                $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
@@ -246,13 +247,14 @@
                $vfs = CreateObject('phpgwapi.vfs');
                $vfs->override_acl = 1;
 
+               $file = "{$directory}/helpdesk.index.pdf";
                $ls_array = $vfs->ls(array(
-                       'string' => $directory,
-                       'relatives' => array(RELATIVE_NONE)
+                       'string'                =>  $file,
+                       'relatives'     => array(RELATIVE_NONE),
+                       'checksubdirs'  => false,
+                       'nofiles'               => true
                ));
 
-               //$file = isset($ls_array[0]['directory']['name']) ? 
"{$ls_array[0]['directory']}/{$ls_array[0]['name']}" : '';
-               $file="{$ls_array[0]['directory']}/helpdesk.index.pdf";
 
                $document = $vfs->read(array(
                        'string'        => $file,
@@ -270,30 +272,6 @@
                $browser = CreateObject('phpgwapi.browser');
                
$browser->content_header($ls_array[0]['name'],$ls_array[0]['mime_type'],$ls_array[0]['size']);
                echo $document;
-               
-/*             $vfs = CreateObject('phpgwapi.vfs');
-               $vfs->override_acl = 1;
-               $filename = 'helpdesk.index.pdf';
-               
-               $path = $this->get_document_path($filename);
-               //$pdffile = PHPGW_SERVER_ROOT . 
"/{$app}/help/{$lang}/{$section}.pdf";
-               //$full_filename = "/opt/portico/pe". $path;
-               $document = $vfs->read
-               (
-                       array
-                       (
-                               'string' => $path,
-                               RELATIVE_NONE
-                       )
-               ); 
-               
-               
-               $browser = CreateObject('phpgwapi.browser');
-               $browser->content_header($filename, '', filesize($document));
-           ob_clean();
-           flush();
-               readfile($document);
-*/
        }
        
        public function delete_document_from_vfs(string $filename)