[eGroupWare-cvs] filescenter/inc class.ui_fm2.inc.php,1.1.1.1,1.2

[<vin...@us...>]

Update of /cvsroot/egroupware/filescenter/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8864/inc

Modified Files:
	class.ui_fm2.inc.php 
Log Message:
Changed File ID Dialog boxes to show project IDs




Index: class.ui_fm2.inc.php
===================================================================
RCS file: /cvsroot/egroupware/filescenter/inc/class.ui_fm2.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** class.ui_fm2.inc.php	27 Oct 2004 23:23:22 -0000	1.1.1.1
--- class.ui_fm2.inc.php	30 Oct 2004 19:25:07 -0000	1.2
***************
*** 989,1022 ****
  		{
  
! 
! 			$vfs_prefixes = CreateObject('phpgwapi.vfs_prefixes');
! 
! 			$prefixes = $vfs_prefixes->get_prefixes();
! 			
! 			$select_prefix0 = '<select name="prefix0">';
! 
! 			$select_prefix0 .= '<option value="'.$this->user_info['account_lid'].'">'.$this->user_info['account_lid']."</option>\n";
! 
! 			foreach($prefixes as $prefix)
! 			{
! 				$select_prefix0 .= '<option value="'.$prefix['prefix'].'">'.$prefix['prefix'].' ('.$prefix['prefix_description'].")</option>\n";
! 			}
! 
! 			$select_prefix0 .= '</select>';
! 
! 
! 			$ptypes = $vfs_prefixes->get_prefixes('view',false,'t');
  			
- 			$select_type0 = '<select name="type0">';
- 
- 			$select_type0 .= '<option value="'.$this->user_info['account_lid'].'">'.$this->user_info['account_lid']."</option>\n";
- 
- 			foreach($ptypes as $prefix)
- 			{
- 				$select_type0 .= '<option value="'.$prefix['prefix'].'">'.$prefix['prefix'].' ('.$prefix['prefix_description'].")</option>\n";
- 			}
- 
- 			$select_type0 .= '</select>';
- 
  		
  			$this->display_app_header();
--- 989,994 ----
  		{
  
! 			$this->get_prefix_selects($select_prefix0,$select_type0);
  			
  		
  			$this->display_app_header();
***************
*** 1052,1055 ****
--- 1024,1082 ----
  
  		/*!
+ 		 @function get_prefix_selects
+ 		 @abstract creates the selects for file id prefix and file id type
+ 		 @author Vinicius Cubas Brand
+ 		*/
+ 		function get_prefix_selects(&$sel_prefixes,&$sel_ptypes)
+ 		{
+ 			$vfs_prefixes = CreateObject('phpgwapi.vfs_prefixes');
+ 
+ 			$prefixes = $vfs_prefixes->get_prefixes();
+ 
+ 			
+ 			$sel_prefixes = '<select name="prefix0">';
+ 
+ 			$sel_prefixes .= '<option value="'.$this->user_info['account_lid'].'">'.$this->user_info['account_lid']."</option>\n";
+ 
+ 			foreach($prefixes as $prefix)
+ 			{
+ 				$sel_prefixes .= '<option value="'.$prefix['prefix'].'">'.$prefix['prefix'].' ('.$prefix['prefix_description'].")</option>\n";
+ 			}
+ 
+ 			//get prefixes from projects
+ 
+ 			$boprojects = CreateObject('projects.boprojects',True,'mains');
+ 			$projs = $boprojects->list_projects(array('action' => 'mains'));
+ 
+ 			foreach($projs as $proj)
+ 			{
+ 				$sel_prefixes .= '<option value="'.$proj['number'].'">'.$proj['number'].' ('.$proj['title'].")</option>\n";
+ 			}
+ 
+ 
+ 			$sel_prefixes .= '</select>';
+ 
+ 
+ 
+ 
+ 			$ptypes = $vfs_prefixes->get_prefixes('view',false,'t');
+ 			
+ 			$sel_ptypes = '<select name="type0">';
+ 
+ 			$sel_ptypes .= '<option value="">('.lang('None').")</option>\n";
+ 
+ 			$sel_ptypes .= '<option value="'.$this->user_info['account_lid'].'">'.$this->user_info['account_lid']."</option>\n";
+ 
+ 			foreach($ptypes as $prefix)
+ 			{
+ 				$sel_ptypes .= '<option value="'.$prefix['prefix'].'">'.$prefix['prefix'].' ('.$prefix['prefix_description'].")</option>\n";
+ 			}
+ 
+ 			$sel_ptypes .= '</select>';
+ 
+ 		}
+ 
+ 
+ 		/*!
  		 @function properties
  		 @abstract creates the file properties screen
***************
*** 1731,1750 ****
  		{
  
- 			$vfs_prefixes = CreateObject('phpgwapi.vfs_prefixes');
- 
- 			$prefixes = $vfs_prefixes->get_prefixes();
- 			
- 			$select_prefix0 = '<select name="formvar[arch_prefix]">';
- 
- 			$select_prefix0 .= '<option value="'.$this->user_info['account_lid'].'">'.$this->user_info['account_lid']."</option>\n";
  
! 			foreach($prefixes as $prefix)
! 			{
! 				$select_prefix0 .= '<option value="'.$prefix['prefix'].'">'.$prefix['prefix'].' ('.$prefix['prefix_description'].")</option>\n";
! 			}
! 
! 			$select_prefix0 .= '</select>';
! 
! 		
  			if (!count($GLOBALS["_POST"]['files']))
  			{
--- 1758,1764 ----
  		{
  
  
! 			$this->get_prefix_selects($select_prefix0,$select_ptype0);
! 	
  			if (!count($GLOBALS["_POST"]['files']))
  			{
***************
*** 1763,1766 ****
--- 1777,1781 ----
  			$this->t->set_var('lang_select_name',lang('Archive name'));
  			$this->t->set_var('lang_select_prefix',lang('File ID Prefix'));
+ 			$this->t->set_var('lang_select_type',lang('File Type'));
  			$this->t->set_var('lang_upload_anotherfile',lang('Add another file'));
  			$this->t->set_var('lang_strremove',lang('remove'));
***************
*** 1773,1776 ****
--- 1788,1792 ----
  			$this->t->set_var('files_list',urlencode(serialize($GLOBALS['_POST']['files'])));
  			$this->t->set_var('select_prefix',$select_prefix0);
+ 			$this->t->set_var('select_ptype',$select_ptype0);
  
  
***************
*** 1791,1797 ****
  			$compression_type = $this->formvar['type'];
  			$archname = $this->formvar['archname'];
! 			$prefix = $this->formvar['arch_prefix'];
  		
! 			$this->bo->fileCompress($files,$archname,$compression_type,$this->path,$prefix);
  			header('Location: '.$this->return_to_path);
  			$GLOBALS['phpgw']->common->phpgw_exit();
--- 1807,1814 ----
  			$compression_type = $this->formvar['type'];
  			$archname = $this->formvar['archname'];
! 			$prefix = get_var('prefix0',array('GET','POST'));
! 			$type = get_var('type0',array('GET','POST')); 
  		
! 			$this->bo->fileCompress($files,$archname,$compression_type,$this->path,$prefix,$type);
  			header('Location: '.$this->return_to_path);
  			$GLOBALS['phpgw']->common->phpgw_exit();