[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.14,1.15

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv14575/inc

Modified Files:
        class.uicategories.inc.php 
Log Message:
fix for bug 1286

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uicategories.inc.php  25 Sep 2002 03:56:06 -0000      1.14
--- class.uicategories.inc.php  4 Oct 2002 20:58:39 -0000       1.15
***************
*** 1,19 ****
  <?php
!   /**************************************************************************\
!   * phpGroupWare - Preferences - categories                                  *
!   * http://www.phpgroupware.org                                              *
!   * Written by Bettina Gille address@hidden                          *
!   * -----------------------------------------------                          *
!   *  This program is free software; you can redistribute it and/or modify it *
!   *  under the terms of the GNU General Public License as published by the   *
!   *  Free Software Foundation; either version 2 of the License, or (at your  *
!   *  option) any later version.                                              *
!   \**************************************************************************/
!   /* $Id$ */
  
        class uicategories
        {
                var $bo;
-               var $t;
  
                var $start;
--- 1,18 ----
  <?php
!       
/**************************************************************************\
!       * phpGroupWare - Preferences - categories                               
   *
!       * http://www.phpgroupware.org                                           
   *
!       * Written by Bettina Gille address@hidden                          *
!       * -----------------------------------------------                       
   *
!       *  This program is free software; you can redistribute it and/or modify 
it *
!       *  under the terms of the GNU General Public License as published by 
the   *
!       *  Free Software Foundation; either version 2 of the License, or (at 
your  *
!       *  option) any later version.                                           
   *
!       
\**************************************************************************/
!       /* $Id$ */
  
        class uicategories
        {
                var $bo;
  
                var $start;
***************
*** 25,46 ****
                var $public_functions = array
                (
!                       'index'  => True,
!                       'add'    => True,
!                       'edit'   => True,
!                       'delete' => True
                );
  
                function uicategories()
                {
!                       
!                       $this->bo         = 
CreateObject('preferences.bocategories',$cats_app);
!                       $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
!                       $this->account    = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       $this->user       = 
$GLOBALS['phpgw_info']['user']['fullname'];
! 
!                       $this->start = $this->bo->start;
!                       $this->query = $this->bo->query;
!                       $this->sort  = $this->bo->sort;
!                       $this->order = $this->bo->order;
                }
  
--- 24,46 ----
                var $public_functions = array
                (
!                       'index'         => True,
!                       'add'           => True,
!                       'edit'          => True,
!                       'delete'        => True
                );
  
                function uicategories()
                {
!                       $cats_app                       = 
get_var('cats_app',array('POST','GET'));      
! 
!                       $this->bo                       = 
CreateObject('preferences.bocategories',$cats_app);
!                       $this->nextmatchs       = 
CreateObject('phpgwapi.nextmatchs');
!                       $this->account          = 
$GLOBALS['phpgw_info']['user']['account_id'];
!                       $this->user                     = 
$GLOBALS['phpgw_info']['user']['fullname'];
! 
!                       $this->start            = $this->bo->start;
!                       $this->query            = $this->bo->query;
!                       $this->sort                     = $this->bo->sort;
!                       $this->order            = $this->bo->order;
                }
  
***************
*** 49,56 ****
                        $data = array
                        (
!                               'start' => $this->start,
!                               'query' => $this->query,
!                               'sort'  => $this->sort,
!                               'order' => $this->order
                        );
                        $this->bo->save_sessiondata($data,$cats_app);
--- 49,56 ----
                        $data = array
                        (
!                               'start' => $this->start,
!                               'query' => $this->query,
!                               'sort'  => $this->sort,
!                               'order' => $this->order
                        );
                        $this->bo->save_sessiondata($data,$cats_app);
***************
*** 95,103 ****
                        $link_data = array
                        (
!                               'menuaction'  => 
'preferences.uicategories.index',
!                               'cats_app'    => $cats_app,
!                               'extra'       => $extra,
!                               'global_cats' => $global_cats,
!                               'cats_level'  => $cats_level
                        );
  
--- 95,103 ----
                        $link_data = array
                        (
!                               'menuaction'    => 
'preferences.uicategories.index',
!                               'cats_app'              => $cats_app,
!                               'extra'                 => $extra,
!                               'global_cats'   => $global_cats,
!                               'cats_level'    => $cats_level
                        );
  
***************
*** 393,402 ****
                        }
  
!                       $new_parent      = get_var('new_parent',Array('POST'));
!                       $cat_parent      = get_var('cat_parent',Array('POST'));
!                       $cat_name        = get_var('cat_name',Array('POST'));
!                       $cat_description = 
get_var('cat_description',Array('POST'));
!                       $cat_data        = get_var('cat_data',Array('POST'));
!                       $cat_access      = get_var('cat_access',Array('POST'));
  
                        if ($new_parent)
--- 393,403 ----
                        }
  
!                       $new_parent                     = 
get_var('new_parent',Array('POST'));
!                       $cat_parent                     = 
get_var('cat_parent',Array('POST'));
!                       $cat_name                       = 
get_var('cat_name',Array('POST'));
!                       $cat_description        = 
get_var('cat_description',Array('POST'));
!                       $cat_data                       = 
get_var('cat_data',Array('POST'));
!                       $cat_access                     = 
get_var('cat_access',Array('POST'));
!                       $old_parent                     = 
get_var('old_parent',array('POST'));
  
                        if ($new_parent)
***************
*** 411,420 ****
                                $values = array
                                (
!                                       'id'     => $cat_id,
!                                       'parent' => $cat_parent,
!                                       'descr'  => $cat_description,
!                                       'name'   => $cat_name,
!                                       'access' => $cat_access,
!                                       'data'   => $data
                                );
  
--- 412,422 ----
                                $values = array
                                (
!                                       'id'                    => $cat_id,
!                                       'parent'                => $cat_parent,
!                                       'old_parent'    => $old_parent,
!                                       'descr'                 => 
$cat_description,
!                                       'name'                  => $cat_name,
!                                       'access'                => $cat_access,
!                                       'data'                  => $data
                                );
  
***************
*** 426,430 ****
                                else
                                {
!                                       $this->bo->save_cat($values);
                                        $message = lang('Category x has been 
updated !',$cat_name);
                                }
--- 428,432 ----
                                else
                                {
!                                       $cat_id = $this->bo->save_cat($values);
                                        $message = lang('Category x has been 
updated !',$cat_name);
                                }
***************
*** 442,445 ****
--- 444,449 ----
  
                        $cats = $this->bo->cats->return_single($cat_id);
+ 
+                       
$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden" 
name="old_parent" value="' . $cats[0]['parent'] . '">');
  
                        
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit x category 
for',lang($cats_app)));