[eGroupWare-cvs] jinn/inc class.bouser.inc.php,1.42,1.43 class.uiu_list_records.inc.php,1.3,1.4 hook

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	class.bouser.inc.php class.uiu_list_records.inc.php 
	hook_sidebox_menu.inc.php 
Log Message:
removing old files
adding advanced filters


Index: class.bouser.inc.php
===================================================================
RCS file: /cvsroot/egroupware/jinn/inc/class.bouser.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** class.bouser.inc.php	30 Dec 2004 17:35:39 -0000	1.42
--- class.bouser.inc.php	30 Dec 2004 21:14:41 -0000	1.43
***************
*** 28,31 ****
--- 28,32 ----
  	  var $public_functions = Array
  	  (
+ 		 'set_adv_filter'			=> True,
  		 'record_update'			=> True,
  		 'record_insert'			=> True,
***************
*** 142,146 ****
  			}
  		
! 		//	$this->message['debug'][]='OBJECT_ARRAY: '._debug_array($this->browse_settings,false);
  		 }
  	  }
--- 143,147 ----
  			}
  		
! 			//$this->message['debug'][]='OBJECT_ARRAY: '._debug_array($this->browse_settings,false);
  		 }
  	  }
***************
*** 1220,1223 ****
--- 1221,1231 ----
  	  }
  
+ 		function set_adv_filter()
+ 		{
+ 		   $this->browse_settings[adv_filter_str]=$_POST[adv_filter];  
+ 		   $this->save_sessiondata();
+ 		   $this->common->exit_and_open_screen('jinn.uiu_list_records.display');
+ 		}
+ 	  
  	  /**
  	  * include ALL plugins

Index: class.uiu_list_records.inc.php
===================================================================
RCS file: /cvsroot/egroupware/jinn/inc/class.uiu_list_records.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.uiu_list_records.inc.php	30 Dec 2004 17:35:39 -0000	1.3
--- class.uiu_list_records.inc.php	30 Dec 2004 21:14:41 -0000	1.4
***************
*** 30,34 ****
  	  (
  		 'display'		=> True,
! 		 'browse_objects'		=> True
  	  );
  
--- 30,35 ----
  	  (
  		 'display'		=> True,
! 		 'browse_objects'		=> True,
! 		 'advanced_filters'	=> True
  	  );
  
***************
*** 128,132 ****
  			return lang('There are no pages');
  		 }
! 		 
  		 if(!$current_page) $current_page=1;
  
--- 129,133 ----
  			return lang('There are no pages');
  		 }
! 
  		 if(!$current_page) $current_page=1;
  
***************
*** 227,232 ****
  		 }
  
! 		return $pager;
! 		 
  	  }
  
--- 228,233 ----
  		 }
  
! 		 return $pager;
! 
  	  }
  
***************
*** 291,295 ****
  
  		 $rec_per_page = $this->bo->records_per_page();
! 		 
  		 $offset = $this->bo->get_offset($current_page,$rec_per_page);
  
--- 292,296 ----
  
  		 $rec_per_page = $this->bo->records_per_page();
! 
  		 $offset = $this->bo->get_offset($current_page,$rec_per_page);
  
***************
*** 309,313 ****
  			$quick_filter = trim( $this->bo->browse_settings['quick_filter'] );
  		 }
! 
  		 $this->bo->browse_settings = array
  		 (
--- 310,316 ----
  			$quick_filter = trim( $this->bo->browse_settings['quick_filter'] );
  		 }
! 		 $adv_filter_str=$this->bo->browse_settings[adv_filter_str];
! 		 
! 		 
  		 $this->bo->browse_settings = array
  		 (
***************
*** 315,319 ****
  			'quick_filter'=>$quick_filter,
  			'filter_arr'=>$filter_arr,
! 			'current_page'=>$current_page
  		 );
  
--- 318,323 ----
  			'quick_filter'=>$quick_filter,
  			'filter_arr'=>$filter_arr,
! 			'current_page'=>$current_page,
! 			'adv_filter_str'=>$adv_filter_str
  		 );
  
***************
*** 392,395 ****
--- 396,412 ----
  		 }
  
+ 		 //fixme start of advanced filters
+ 		 if($adv_filter_str)
+ 		 {
+ 			if ($where_condition) 
+ 			{
+ 			   $where_condition.= " AND ($adv_filter_str)"; 	
+ 			}
+ 			else
+ 			{
+ 			   $where_condition= " ($adv_filter_str)"; 	
+ 			}
+ 		 }
+ 
  		 /* which/how many column to show, all, the prefered, or the default thirst 4 */
  		 if ($show_all_cols=='True' || $default_col_num=='-1')
***************
*** 481,485 ****
  			// get pager code
  			$pager=$this->pager($current_page,$num_rows,$rec_per_page);
! 			
  			$this->template->set_var('list_form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=jinn.bouser.multiple_actions'));
  			$this->template->set_var('colfield_lang_confirm_delete_multiple',lang('Are you sure you want to delete these multiple records?'));
--- 498,502 ----
  			// get pager code
  			$pager=$this->pager($current_page,$num_rows,$rec_per_page);
! 
  			$this->template->set_var('list_form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=jinn.bouser.multiple_actions'));
  			$this->template->set_var('colfield_lang_confirm_delete_multiple',lang('Are you sure you want to delete these multiple records?'));
***************
*** 512,516 ****
  
  			$this->template->set_var('popuplink',$popuplink);
! 			
  			$this->template->set_var('colhead_bg_color',$GLOBALS['phpgw_info']['theme']['th_bg']);
  			$this->template->set_var('colhead_order_link',$GLOBALS[phpgw]->link("/index.php","menuaction=jinn.uiu_list_records.display&orderby=$orderby_link"));
--- 529,533 ----
  
  			$this->template->set_var('popuplink',$popuplink);
! 
  			$this->template->set_var('colhead_bg_color',$GLOBALS['phpgw_info']['theme']['th_bg']);
  			$this->template->set_var('colhead_order_link',$GLOBALS[phpgw]->link("/index.php","menuaction=jinn.uiu_list_records.display&orderby=$orderby_link"));
***************
*** 528,532 ****
  		 }
  
! 		 
  		 $this->template->parse('out','header');
  		 $this->template->pparse('out','header');
--- 545,549 ----
  		 }
  
! 
  		 $this->template->parse('out','header');
  		 $this->template->pparse('out','header');
***************
*** 665,668 ****
--- 682,743 ----
  	  }
  
+ 	  function advanced_filters()
+ 	  {
+ 		 unset($this->bo->mult_where_array);
+ 
+ 		 // check if table exists
+ 		 if(!$this->bo->so->test_JSO_table($this->bo->site_object))
+ 		 {
+ 			unset($this->bo->site_object_id);
+ 			$this->bo->message['error']=lang('Failed to open table. Please check if table <i>%1</i> still exists in database',$this->bo->site_object['table_name']);
+ 			$this->bo->message['error_code']=117;
+ 
+ 			$this->bo->save_sessiondata();
+ 			$this->bo->common->exit_and_open_screen('jinn.uiuser.index');
+ 		 }				
+ 
+ 		 // check if there's permission to this object
+ 		 if(!$this->bo->acl->has_object_access($this->bo->site_object_id))
+ 		 {
+ 			unset($this->bo->site_object_id);
+ 			$this->bo->message['error']=lang('You have no access to this object');
+ 			$this->bo->message['error_code']=116;
+ 
+ 			$this->bo->save_sessiondata();
+ 			$this->bo->common->exit_and_open_screen('jinn.uiuser.index');
+ 		 }
+ 
+ 		 $this->ui->header('set advanced browsing filters');
+ 		 $this->ui->msg_box($this->bo->message);
+ 		 unset($this->bo->message);
+ 
+ 		 $this->ui->main_menu();	
+ 
+ 		 $this->template->set_file(array(
+ 			'adv_filters' => 'advanced_filters.tpl',
+ 		 ));
+ 
+ 		 $adv_filter_str=$this->bo->browse_settings[adv_filter_str];  
+ 
+ 
+ 		 $this->template->set_block('adv_filters','header','header');
+ 		 $this->template->set_block('adv_filters','row','row');
+ 		 $this->template->set_block('adv_filters','footer','footer');
+ 
+ 		 $this->template->set_var('action',$GLOBALS['phpgw']->link('/index.php','menuaction=jinn.bouser.set_adv_filter'));
+ 		 $this->template->set_var('adv_filter',$adv_filter_str);
+ 		 $this->template->set_var('submit',lang('submit'));
+ 
+ 
+ 		 $this->template->parse('out','header');
+ 		 $this->template->pparse('out','header');
+ 
+ 		 $this->template->parse('out','footer');
+ 		 $this->template->pparse('out','footer');
+ 
+ 		 $this->bo->save_sessiondata();
+ 
+ 
+ 	  }
  
     }

Index: hook_sidebox_menu.inc.php
===================================================================
RCS file: /cvsroot/egroupware/jinn/inc/hook_sidebox_menu.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** hook_sidebox_menu.inc.php	22 Dec 2004 16:38:04 -0000	1.19
--- hook_sidebox_menu.inc.php	30 Dec 2004 21:14:41 -0000	1.20
***************
*** 208,211 ****
--- 208,217 ----
  			$menu_title = lang('Developer Links');
  			$file = Array(
+ 			   'Advanced Filters' => array
+ 			   (
+ 				  'link'=>$GLOBALS['phpgw']->link('/index.php','menuaction=jinn.uiu_list_records.advanced_filters'),
+ 				  'text'=>'Advanced Filters',
+ 				  'icon'=>'filter'
+ 			   ),
  			   'Site Media and Documents' => array
  			   (

[eGroupWare-cvs] jinn/inc class.bouser.inc.php,1.42,1.43 class.uiu_list_records.inc.php,1.3,1.4 hook

[eGroupWare-cvs] jinn/inc class.bouser.inc.php,1.42,1.43 class.uiu_list_records.inc.php,1.3,1.4 hook_sidebox_menu.inc.php,1.19,1.20