phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: projects/inc class.sobilling.inc.php,1.11.2.1.2


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] CVS: projects/inc class.sobilling.inc.php,1.11.2.1.2.2,1.11.2.1.2.3 class.sodeliveries.inc.php,1.15.2.1.2.1,1.15.2.1.2.2 class.uiprojects.inc.php,1.47.2.7.2.17,1.47.2.7.2.18
Date: Sun, 15 Jun 2003 17:39:40 -0400

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv25786/inc

Modified Files:
      Tag: Version-0_9_16-branch
        class.sobilling.inc.php class.sodeliveries.inc.php 
        class.uiprojects.inc.php 
Log Message:
update

Index: class.sobilling.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sobilling.inc.php,v
retrieving revision 1.11.2.1.2.2
retrieving revision 1.11.2.1.2.3
diff -C2 -r1.11.2.1.2.2 -r1.11.2.1.2.3
*** class.sobilling.inc.php     14 Jun 2003 23:49:56 -0000      1.11.2.1.2.2
--- class.sobilling.inc.php     15 Jun 2003 21:39:37 -0000      1.11.2.1.2.3
***************
*** 42,47 ****
                        switch ($dbtype)
                        {
!                               case 'pgsql':   $join = " JOIN "; break;
!                               case 'mysql':   $join = " LEFT JOIN "; break;
                        }
                        return $join;
--- 42,47 ----
                        switch ($dbtype)
                        {
!                               case 'pgsql':   $join = ' JOIN '; break;
!                               case 'mysql':   $join = ' LEFT JOIN '; break;
                        }
                        return $join;

Index: class.sodeliveries.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sodeliveries.inc.php,v
retrieving revision 1.15.2.1.2.1
retrieving revision 1.15.2.1.2.2
diff -C2 -r1.15.2.1.2.1 -r1.15.2.1.2.2
*** class.sodeliveries.inc.php  26 Apr 2003 01:33:45 -0000      1.15.2.1.2.1
--- class.sodeliveries.inc.php  15 Jun 2003 21:39:37 -0000      1.15.2.1.2.2
***************
*** 7,11 ****
        * Written by Bettina Gille address@hidden                   *
        * -----------------------------------------------                   *
!       * Copyright (C) 2000,2001,2002 Bettina Gille                        *
        *                                                                   *
        * This program is free software; you can redistribute it and/or     *
--- 7,11 ----
        * Written by Bettina Gille address@hidden                   *
        * -----------------------------------------------                   *
!       * Copyright (C) 2000 - 2003 Bettina Gille                           *
        *                                                                   *
        * This program is free software; you can redistribute it and/or     *
***************
*** 41,46 ****
                        switch ($dbtype)
                        {
!                               case 'pgsql':   $join = " JOIN "; break;
!                               case 'mysql':   $join = " LEFT JOIN "; break;
                        }
                        return $join;
--- 41,46 ----
                        switch ($dbtype)
                        {
!                               case 'pgsql':   $join = ' JOIN '; break;
!                               case 'mysql':   $join = ' LEFT JOIN '; break;
                        }
                        return $join;
***************
*** 50,66 ****
                {
                        $values['delivery_num'] = 
$this->db->db_addslashes($values['delivery_num']);
!                       $this->db->query("INSERT INTO phpgw_p_delivery 
(num,project_id,date,customer) VALUES ('" . $values['delivery_num'] . "','"
!                                                       . $values['project_id'] 
. "','" . time() . "','" . $values['customer'] . "')",__LINE__,__FILE__);
  
                        $this->db2->query("SELECT id from phpgw_p_delivery 
WHERE num='" . $values['delivery_num'] . "'",__LINE__,__FILE__);
                        $this->db2->next_record();
                        $delivery_id = $this->db2->f('id');
  
!                       while($select && $entry=each($select))
                        {
!                               $this->db->query("INSERT INTO 
phpgw_p_deliverypos (delivery_id,hours_id) VALUES ('$delivery_id','" . $entry[0]
!                                                               . 
"')",__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
status='closed' WHERE status='done' AND id='" . $entry[0] . 
"'",__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
dstatus='d' WHERE id='" . $entry[0] . "'",__LINE__,__FILE__);
                        }
                        return $delivery_id;
--- 50,67 ----
                {
                        $values['delivery_num'] = 
$this->db->db_addslashes($values['delivery_num']);
!                       $this->db->query("INSERT INTO phpgw_p_delivery 
(num,project_id,date,customer) VALUES ('" . $values['delivery_num'] . "',"
!                                                       . 
intval($values['project_id']) . ',' . time() . ',' . 
intval($values['customer']) . ')',__LINE__,__FILE__);
  
                        $this->db2->query("SELECT id from phpgw_p_delivery 
WHERE num='" . $values['delivery_num'] . "'",__LINE__,__FILE__);
                        $this->db2->next_record();
                        $delivery_id = $this->db2->f('id');
+                       $delivery_id = intval($delivery_id);
  
!                       while(is_array($select) && $entry=each($select))
                        {
!                               $this->db->query('INSERT INTO 
phpgw_p_deliverypos (delivery_id,hours_id) VALUES (' . $delivery_id . ',' . 
intval($entry[0])
!                                                               . 
')',__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
status='closed' WHERE status='done' AND id=" . 
intval($entry[0]),__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
dstatus='d' WHERE id=" . intval($entry[0]),__LINE__,__FILE__);
                        }
                        return $delivery_id;
***************
*** 69,84 ****
                function update_delivery($values,$select)
                {
                        $values['delivery_num'] = 
$this->db->db_addslashes($values['delivery_num']);
!                       $this->db->query("UPDATE phpgw_p_delivery set num='" . 
$values['delivery_num'] . "',date='" . $values['date'] . "',customer='"
!                                                               . 
$values['customer'] . "' where id='" . $values['delivery_id'] . 
"'",__LINE__,__FILE__);
  
!                       $this->db2->query("DELETE FROM phpgw_p_deliverypos 
WHERE delivery_id='" . $values['delivery_id'] . "'",__LINE__,__FILE__);
  
!                       while($select && $entry=each($select))
                        {
!                               $this->db->query("INSERT INTO 
phpgw_p_deliverypos (delivery_id,hours_id) VALUES ('" . $values['delivery_id'] 
. "','"
!                                                               . $entry[0] . 
"')",__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
status='closed' WHERE status='done' AND id='" . $entry[0] . 
"'",__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
dstatus='d' WHERE id='" . $entry[0] . "'",__LINE__,__FILE__);
                        }
                }
--- 70,87 ----
                function update_delivery($values,$select)
                {
+                       $values['delivery_id'] = intval($values['delivery_id']);
+ 
                        $values['delivery_num'] = 
$this->db->db_addslashes($values['delivery_num']);
!                       $this->db->query("UPDATE phpgw_p_delivery set num='" . 
$values['delivery_num'] . "',date=" . intval($values['date']) . ',customer='
!                                                               . 
intval($values['customer']) . ' where id=' . 
$values['delivery_id'],__LINE__,__FILE__);
  
!                       $this->db2->query('DELETE FROM phpgw_p_deliverypos 
WHERE delivery_id=' . $values['delivery_id'],__LINE__,__FILE__);
  
!                       while(is_array($select) && $entry=each($select))
                        {
!                               $this->db->query('INSERT INTO 
phpgw_p_deliverypos (delivery_id,hours_id) VALUES (' . $values['delivery_id'] . 
','
!                                                               . 
intval($entry[0]) . ')',__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
status='closed' WHERE status='done' AND id=" . 
intval($entry[0]),__LINE__,__FILE__);
!                               $this->db2->query("UPDATE phpgw_p_hours set 
dstatus='d' WHERE id=" . intval($entry[0]),__LINE__,__FILE__);
                        }
                }
***************
*** 86,101 ****
                function read_hours($project_id, $action)
                {
!                       $ordermethod = "order by end_date asc";
  
                        if ($action == 'mains')
                        {
!                               $parent_hours   = " OR 
phpgw_p_hours.pro_parent='" . $project_id . "'";
                        }
  
!                       $this->db->query("SELECT phpgw_p_hours.id as 
id,phpgw_p_hours.hours_descr,phpgw_p_activities.descr,phpgw_p_hours.status,"
!                                                       . 
"phpgw_p_hours.start_date,phpgw_p_hours.minutes,phpgw_p_hours.minperae FROM 
phpgw_p_hours " . $this->return_join()
                                                        . "phpgw_p_activities 
ON phpgw_p_hours.activity_id=phpgw_p_activities.id WHERE 
(phpgw_p_hours.dstatus='o' "
!                                                       . "AND 
phpgw_p_hours.status != 'open') AND (phpgw_p_hours.project_id='" . $project_id 
. "'" . $parent_hours
!                                                       . ") " . 
$ordermethod,__LINE__,__FILE__);
  
                        while ($this->db->next_record())
--- 89,106 ----
                function read_hours($project_id, $action)
                {
!                       $project_id = intval($project_id);
! 
!                       $ordermethod = ' order by end_date asc';
  
                        if ($action == 'mains')
                        {
!                               $parent_hours   = ' OR 
phpgw_p_hours.pro_parent=' . $project_id;
                        }
  
!                       $this->db->query('SELECT phpgw_p_hours.id as 
id,phpgw_p_hours.hours_descr,phpgw_p_activities.descr,phpgw_p_hours.status,'
!                                                       . 
'phpgw_p_hours.start_date,phpgw_p_hours.minutes,phpgw_p_hours.minperae FROM 
phpgw_p_hours' . $this->return_join()
                                                        . "phpgw_p_activities 
ON phpgw_p_hours.activity_id=phpgw_p_activities.id WHERE 
(phpgw_p_hours.dstatus='o' "
!                                                       . "AND 
phpgw_p_hours.status != 'open') AND (phpgw_p_hours.project_id=" . $project_id . 
$parent_hours
!                                                       . ')' . 
$ordermethod,__LINE__,__FILE__);
  
                        while ($this->db->next_record())
***************
*** 118,133 ****
                function read_delivery_hours($project_id, $delivery_id, $action)
                {
!                       $ordermethod = "order by end_date asc";
  
                        if ($action == 'mains' || $action == 'amains')
                        {
!                               $parent_search = " OR 
phpgw_p_hours.pro_parent='" . $project_id . "'";
                        }
  
!                       $this->db->query("SELECT phpgw_p_hours.id as 
id,phpgw_p_hours.hours_descr,phpgw_p_activities.descr,phpgw_p_hours.status,"
!                                                       . 
"phpgw_p_hours.start_date,phpgw_p_hours.minutes,phpgw_p_hours.minperae FROM 
phpgw_p_hours " . $this->return_join()
!                                                       ."phpgw_p_activities ON 
phpgw_p_hours.activity_id=phpgw_p_activities.id " . $this->return_join() . 
"phpgw_p_deliverypos "
!                                                       . "ON 
phpgw_p_hours.id=phpgw_p_deliverypos.hours_id WHERE 
(phpgw_p_hours.project_id='" . $project_id
!                                                       . "'" . $parent_search  
. ") AND phpgw_p_deliverypos.delivery_id='" . $delivery_id . "' " . 
$ordermethod,__LINE__,__FILE__);
  
                        while ($this->db->next_record())
--- 123,141 ----
                function read_delivery_hours($project_id, $delivery_id, $action)
                {
!                       $project_id             = intval($project_id);
!                       $delivery_id    = intval($delivery_id);
! 
!                       $ordermethod = ' order by end_date asc';
  
                        if ($action == 'mains' || $action == 'amains')
                        {
!                               $parent_search = ' OR 
phpgw_p_hours.pro_parent=' . $project_id;
                        }
  
!                       $this->db->query('SELECT phpgw_p_hours.id as 
id,phpgw_p_hours.hours_descr,phpgw_p_activities.descr,phpgw_p_hours.status,'
!                                                       . 
'phpgw_p_hours.start_date,phpgw_p_hours.minutes,phpgw_p_hours.minperae FROM 
phpgw_p_hours' . $this->return_join()
!                                                       . 'phpgw_p_activities 
ON phpgw_p_hours.activity_id=phpgw_p_activities.id' . $this->return_join() . 
'phpgw_p_deliverypos '
!                                                       . 'ON 
phpgw_p_hours.id=phpgw_p_deliverypos.hours_id WHERE (phpgw_p_hours.project_id=' 
. $project_id
!                                                       . $parent_search  . ') 
AND phpgw_p_deliverypos.delivery_id=' . $delivery_id . 
$ordermethod,__LINE__,__FILE__);
  
                        while ($this->db->next_record())
***************
*** 151,154 ****
--- 159,164 ----
                function read_deliveries($start, $query = '', $sort = '', 
$order = '', $limit = True, $project_id = '')
                {
+                       $project_id = intval($project_id);
+ 
                        if ($order)
                        {
***************
*** 157,161 ****
                        else
                        {
!                               $ordermethod = " order by date asc";
                        }
  
--- 167,171 ----
                        else
                        {
!                               $ordermethod = ' order by date asc';
                        }
  
***************
*** 167,179 ****
                        if ($project_id)
                        {
!                               $sql = "SELECT phpgw_p_delivery.id as 
id,phpgw_p_delivery.num,title,phpgw_p_delivery.date,"
!                                       . 
"phpgw_p_delivery.project_id,phpgw_p_delivery.customer FROM 
phpgw_p_delivery,phpgw_p_projects WHERE "
!                                       . 
"phpgw_p_delivery.project_id='$project_id' AND 
phpgw_p_delivery.project_id=phpgw_p_projects.id";
                        }
                else
                        {
!                               $sql = "SELECT phpgw_p_delivery.id as 
id,phpgw_p_delivery.num,title,phpgw_p_delivery.date,"
!                                       . 
"phpgw_p_delivery.project_id,phpgw_p_delivery.customer FROM 
phpgw_p_delivery,phpgw_p_projects WHERE "
!                                       . 
"phpgw_p_delivery.project_id=phpgw_p_projects.id";
                        }
  
--- 177,189 ----
                        if ($project_id)
                        {
!                               $sql = 'SELECT phpgw_p_delivery.id as 
id,phpgw_p_delivery.num,title,phpgw_p_delivery.date,'
!                                       . 
'phpgw_p_delivery.project_id,phpgw_p_delivery.customer FROM 
phpgw_p_delivery,phpgw_p_projects WHERE '
!                                       . 'phpgw_p_delivery.project_id=' . 
$project_id . ' AND phpgw_p_delivery.project_id=phpgw_p_projects.id';
                        }
                else
                        {
!                               $sql = 'SELECT phpgw_p_delivery.id as 
id,phpgw_p_delivery.num,title,phpgw_p_delivery.date,'
!                                       . 
'phpgw_p_delivery.project_id,phpgw_p_delivery.customer FROM 
phpgw_p_delivery,phpgw_p_projects WHERE '
!                                       . 
'phpgw_p_delivery.project_id=phpgw_p_projects.id';
                        }
  
***************
*** 207,213 ****
                function read_single_delivery($delivery_id)
                {
!                       $this->db->query("SELECT 
phpgw_p_delivery.customer,phpgw_p_delivery.num,phpgw_p_delivery.project_id,phpgw_p_delivery.date,
 "
!                                       . 
"phpgw_p_projects.title,phpgw_p_projects.num as pnum FROM 
phpgw_p_delivery,phpgw_p_projects WHERE "
!                                       . "phpgw_p_delivery.id='$delivery_id' 
AND phpgw_p_delivery.project_id=phpgw_p_projects.id",__LINE__,__FILE__);
  
                        if ($this->db->next_record())
--- 217,223 ----
                function read_single_delivery($delivery_id)
                {
!                       $this->db->query('SELECT 
phpgw_p_delivery.customer,phpgw_p_delivery.num,phpgw_p_delivery.project_id,phpgw_p_delivery.date,'
!                                                       . 
'phpgw_p_projects.title,phpgw_p_projects.num as pnum FROM 
phpgw_p_delivery,phpgw_p_projects WHERE '
!                                                       . 
'phpgw_p_delivery.id=' . intval($delivery_id) . ' AND 
phpgw_p_delivery.project_id=phpgw_p_projects.id',__LINE__,__FILE__);
  
                        if ($this->db->next_record())
***************
*** 225,231 ****
                function exists($values)
                {
                        if ($values['delivery_id'] && ($values['delivery_id'] 
!= 0))
                        {
!                               $editexists = " and id != '" . 
$values['delivery_id'] . "'";
                        }
                        $this->db->query("select count(*) from phpgw_p_delivery 
where num='" . $values['delivery_num'] . "'" . $editexists,__LINE__,__FILE__);
--- 235,243 ----
                function exists($values)
                {
+                       $values['delivery_id'] = intval($values['delivery_id']);
+ 
                        if ($values['delivery_id'] && ($values['delivery_id'] 
!= 0))
                        {
!                               $editexists = ' and id !=' . 
$values['delivery_id'];
                        }
                        $this->db->query("select count(*) from phpgw_p_delivery 
where num='" . $values['delivery_num'] . "'" . $editexists,__LINE__,__FILE__);
***************
*** 245,252 ****
                function read_delivery_pos($delivery_id)
                {
!                       $this->db->query("SELECT 
phpgw_p_hours.hours_descr,phpgw_p_hours.minperae,phpgw_p_hours.minutes,"
!                                                       . 
"phpgw_p_activities.descr,phpgw_p_hours.start_date, phpgw_p_hours.end_date FROM 
phpgw_p_hours,phpgw_p_activities,"
!                                                       . "phpgw_p_deliverypos 
WHERE phpgw_p_deliverypos.hours_id=phpgw_p_hours.id AND 
phpgw_p_deliverypos.delivery_id='"
!                                                       . $delivery_id .  "' 
AND phpgw_p_hours.activity_id=phpgw_p_activities.id",__LINE__,__FILE__);
  
                        while ($this->db->next_record())
--- 257,264 ----
                function read_delivery_pos($delivery_id)
                {
!                       $this->db->query('SELECT 
phpgw_p_hours.hours_descr,phpgw_p_hours.minperae,phpgw_p_hours.minutes,'
!                                                       . 
'phpgw_p_activities.descr,phpgw_p_hours.start_date, phpgw_p_hours.end_date FROM 
phpgw_p_hours,phpgw_p_activities,'
!                                                       . 'phpgw_p_deliverypos 
WHERE phpgw_p_deliverypos.hours_id=phpgw_p_hours.id AND 
phpgw_p_deliverypos.delivery_id='
!                                                       . intval($delivery_id) 
. ' AND phpgw_p_hours.activity_id=phpgw_p_activities.id',__LINE__,__FILE__);
  
                        while ($this->db->next_record())

Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.17
retrieving revision 1.47.2.7.2.18
diff -C2 -r1.47.2.7.2.17 -r1.47.2.7.2.18
*** class.uiprojects.inc.php    14 Jun 2003 23:24:27 -0000      1.47.2.7.2.17
--- class.uiprojects.inc.php    15 Jun 2003 21:39:37 -0000      1.47.2.7.2.18
***************
*** 1142,1156 ****
                function list_admins()
                {
!                       $action = get_var('action',array('POST','GET'));
!                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('projects') . ': ' . (($action == 
'pad')?lang('administration'):lang('accountancy'));
!                       $GLOBALS['phpgw']->common->phpgw_header();
!                       echo parse_navbar();
! 
                        $link_data = array
                        (
!                               'menuaction'    => 
'projects.uiprojects.list_admins',
                                'action'                => $action
                        );
  
                        $this->set_app_langs();
  
--- 1142,1165 ----
                function list_admins()
                {
!                       $action = get_var('action',array('GET','POST'));
                        $link_data = array
                        (
!                               'menuaction'    => 
'projects.uiprojects.edit_admins',
                                'action'                => $action
                        );
  
+                       if ($_POST['add'])
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                       }
+ 
+                       if ($_POST['done'])
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/admin/index.php');
+                       }
+ 
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('projects') . ': ' . (($action == 
'pad')?lang('administration'):lang('accountancy'));
+                       $GLOBALS['phpgw']->common->phpgw_header();
+                       echo parse_navbar();
                        $this->set_app_langs();
  
***************
*** 1160,1164 ****
                        
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
                        
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query'
 => $this->query)));
!                       
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
  
                        if (!$this->start)
--- 1169,1174 ----
                        
$GLOBALS['phpgw']->template->set_var('search_action',$GLOBALS['phpgw']->link('/index.php',$link_data));
                        
$GLOBALS['phpgw']->template->set_var('search_list',$this->nextmatchs->search(array('query'
 => $this->query)));
!                       $link_data['menuaction'] = 
'projects.uiprojects.list_admins';
!                       
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        if (!$this->start)
***************
*** 1212,1217 ****
                                
$GLOBALS['phpgw']->template->fp('list','admin_list',True);
                        }
!                       $link_data['menuaction'] = 
'projects.uiprojects.edit_admins';
!                       
$GLOBALS['phpgw']->template->set_var('addurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
                        
$GLOBALS['phpgw']->template->pfp('out','admin_list_t',True);
                        $this->save_sessiondata($action);
--- 1222,1226 ----
                                
$GLOBALS['phpgw']->template->fp('list','admin_list',True);
                        }
! 
                        
$GLOBALS['phpgw']->template->pfp('out','admin_list_t',True);
                        $this->save_sessiondata($action);
***************
*** 1220,1224 ****
                function edit_admins()
                {
!                       $action = get_var('action',array('POST','GET'));
                        $users  = get_var('users',array('POST'));
                        $groups = get_var('groups',array('POST'));
--- 1229,1233 ----
                function edit_admins()
                {
!                       $action = get_var('action',array('GET','POST'));
                        $users  = get_var('users',array('POST'));
                        $groups = get_var('groups',array('POST'));
***************
*** 1226,1230 ****
                        $link_data = array
                        (
!                               'menuaction'    => 
'projects.uiprojects.edit_admins',
                                'action'                => $action
                        );
--- 1235,1239 ----
                        $link_data = array
                        (
!                               'menuaction'    => 
'projects.uiprojects.list_admins',
                                'action'                => $action
                        );
***************
*** 1233,1239 ****
                        {
                                $this->bo->edit_admins($action, $users, 
$groups);
-                               $link_data['menuaction'] = 
'projects.uiprojects.list_admins';
                                
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('projects') . ': ' . (($action == 'pad')?lang('edit administrator 
list'):lang('edit bookkeeper list'));
                        $GLOBALS['phpgw']->common->phpgw_header();
--- 1242,1253 ----
                        {
                                $this->bo->edit_admins($action, $users, 
$groups);
                                
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
+ 
+                       if ($_POST['cancel'])
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                       }
+ 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('projects') . ': ' . (($action == 'pad')?lang('edit administrator 
list'):lang('edit bookkeeper list'));
                        $GLOBALS['phpgw']->common->phpgw_header();
***************
*** 1244,1248 ****
                        $GLOBALS['phpgw']->template->set_file(array('admin_add' 
=> 'form_admin.tpl'));
  
!                       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        
$GLOBALS['phpgw']->template->set_var('users_list',$this->bo->selected_admins($action,'aa'));
--- 1258,1263 ----
                        $GLOBALS['phpgw']->template->set_file(array('admin_add' 
=> 'form_admin.tpl'));
  
!                       $link_data['menuaction'] = 
'projects.uiprojects.edit_admins';
!                       
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        
$GLOBALS['phpgw']->template->set_var('users_list',$this->bo->selected_admins($action,'aa'));





reply via email to

[Prev in Thread] Current Thread [Next in Thread]