[Phpgroupware-cvs] CVS: todo/inc class.ui.inc.php,1.8,1.9

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/todo/inc
In directory subversions:/tmp/cvs-serv24061/todo/inc

Modified Files:
        class.ui.inc.php 
Log Message:
Changed over to GLOBALS for just the ui at this point.

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.ui.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.ui.inc.php    1 Feb 2002 20:52:39 -0000       1.8
--- class.ui.inc.php    18 Feb 2002 14:00:17 -0000      1.9
***************
*** 58,62 ****
                        $this->t          = $GLOBALS['phpgw']->template;
                        $this->grants     = 
$GLOBALS['phpgw']->acl->get_grants('todo');
!                       $this->grants[$this->account]   = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
                        $this->start      = $this->bo->start;
--- 58,62 ----
                        $this->t          = $GLOBALS['phpgw']->template;
                        $this->grants     = 
$GLOBALS['phpgw']->acl->get_grants('todo');
! //                    $this->grants[$this->account]   = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
                        $this->start      = $this->bo->start;
***************
*** 139,148 ****
  // ------------------------- end nextmatch template 
--------------------------------------
  
!             
$this->t->set_var('cat_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
                        
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
!             
$this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
!             
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,array('yours' => 
1,'filter' => $this->filter)));
!             
$this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
!             
$this->t->set_var('search_list',$this->nextmatchs->search(array('search_obj' => 
1,'query' => $this->query)));
  
  // ---------------- list header variable template-declarations 
--------------------------
--- 139,148 ----
  // ------------------------- end nextmatch template 
--------------------------------------
  
!                       
$this->t->set_var('cat_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
                        
$this->t->set_var('categories',$this->cats->formated_list('select','all',$this->cat_id,'True'));
!                       
$this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
!                       
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,array('yours' => 
1,'filter' => $this->filter)));
!                       
$this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
!                       
$this->t->set_var('search_list',$this->nextmatchs->search(array('search_obj' => 
1,'query' => $this->query)));
  
  // ---------------- list header variable template-declarations 
--------------------------
***************
*** 289,293 ****
                        else
                        {
!                               if 
($this->bo->check_perms($this->grants[$cat[0]['owner']],PHPGW_ACL_ADD) || 
$cat[0]['owner'] == $this->account)
                                {
                                        $this->t->set_var('add','<form 
method="POST" action="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.add&cat_id=' . 
$this->cat_id)
--- 289,293 ----
                        else
                        {
!                               if 
($this->bo->check_perms($this->grants[$cat[0]['owner']],PHPGW_ACL_ADD) || 
$cat[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
                                {
                                        $this->t->set_var('add','<form 
method="POST" action="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.add&cat_id=' . 
$this->cat_id)
***************
*** 307,311 ****
                        $month = date('m');
  
!                       
$this->t->set_var('matrixview',$GLOBALS['phpgw']->common->check_owner($this->account,'/index.php',
                                                                lang('View 
matrix of actual month'),'menuaction=todo.ui.matrix&month=' . $month . '&year=' 
. $year));
  
--- 307,311 ----
                        $month = date('m');
  
!                       
$this->t->set_var('matrixview',$GLOBALS['phpgw']->common->check_owner($GLOBALS['phpgw_info']['user']['account_id'],'/index.php',
                                                                lang('View 
matrix of actual month'),'menuaction=todo.ui.matrix&month=' . $month . '&year=' 
. $year));
  
***************
*** 421,424 ****
--- 421,425 ----
                                        $this->bo->save($values);
                                        Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list&cat_id=' . 
$cat_id));
+                                       $GLOBALS['phpgw']->common->phpgw_exit();
                                }
                        }
***************
*** 587,590 ****
--- 588,592 ----
                                        $this->bo->save($values,'edit');
                                        Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list&cat_id=' . 
$cat_id));
+                                       $GLOBALS['phpgw']->common->phpgw_exit();
                                }
                        }
***************
*** 661,665 ****
                        $this->t->set_var('access_list', '<input 
type="checkbox" name="values[access]" value="True"' . ($values['access'] == 
'private'?' checked':'') . '>');
  
!                       if 
($this->bo->check_perms($this->grants[$values['owner']],PHPGW_ACL_DELETE) || 
$values['owner'] == $this->account)
                        {
                                $this->t->set_var('delete','<form method="POST" 
action="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.delete&todo_id=' . 
$values['id'])
--- 663,667 ----
                        $this->t->set_var('access_list', '<input 
type="checkbox" name="values[access]" value="True"' . ($values['access'] == 
'private'?' checked':'') . '>');
  
!                       if 
($this->bo->check_perms($this->grants[$values['owner']],PHPGW_ACL_DELETE) || 
$values['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
                        {
                                $this->t->set_var('delete','<form method="POST" 
action="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.delete&todo_id=' . 
$values['id'])
***************
*** 753,757 ****
                                        
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($entries[$i]['title']),$startd,$endd,$colors[$ind]);
  
!                                       $subentries = 
$this->bo->_list($start,False,$query,$filter,$order,$sort,$cat_id,'subs',$entries[$i]['id']);
                                        for ($j=0;$j<count($subentries);$j++)
                                        {
--- 755,759 ----
                                        
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($entries[$i]['title']),$startd,$endd,$colors[$ind]);
  
!                                       $subentries = 
$this->bo->list_todos($start,False,$query,$filter,$order,$sort,$cat_id,'subs',$entries[$i]['id']);
                                        for ($j=0;$j<count($subentries);$j++)
                                        {
***************
*** 759,764 ****
                                                {
                                                        $startd = 
date('Y',$subentries[$j]['sdate_epoch']) . 
date('m',$subentries[$j]['sdate_epoch']) . 
date('d',$subentries[$j]['sdate_epoch']);                                       
                 
!                               $endd = 
date('Y',$subentries[$j]['edate_epoch']) . 
date('m',$subentries[$j]['edate_epoch']) . 
date('d',$subentries[$j]['edate_epoch']);
!                               
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($subentries[$j]['title']),$startd,$endd,$colors[$ind]);
                                                }
                                        }
--- 761,766 ----
                                                {
                                                        $startd = 
date('Y',$subentries[$j]['sdate_epoch']) . 
date('m',$subentries[$j]['sdate_epoch']) . 
date('d',$subentries[$j]['sdate_epoch']);                                       
                 
!                                                       $endd = 
date('Y',$subentries[$j]['edate_epoch']) . 
date('m',$subentries[$j]['edate_epoch']) . 
date('d',$subentries[$j]['edate_epoch']);
!                                                       
$this->matrix->setPeriod($GLOBALS['phpgw']->strip_html($subentries[$j]['title']),$startd,$endd,$colors[$ind]);
                                                }
                                        }