[Phpgroupware-cvs] projects/inc/class.uiprojects.inc.php, 1.144

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.uiprojects.inc.php

date: 2004/06/03 13:38:59;  author: ceb;  state: Exp;  lines: +18 -16

Log Message:
update
=====================================================================
Index: projects/inc/class.uiprojects.inc.php
diff -u projects/inc/class.uiprojects.inc.php:1.143 
projects/inc/class.uiprojects.inc.php:1.144
--- projects/inc/class.uiprojects.inc.php:1.143 Wed Jun  2 16:27:41 2004
+++ projects/inc/class.uiprojects.inc.php       Thu Jun  3 13:38:59 2004
@@ -805,7 +805,7 @@
 
                        if($_POST['roles'])
                        {
-                               $link_data['menuaction'] = 
'projects.uiprojects.assign_employee_roles';
+                               $link_data['menuaction']        = 
'projects.uiprojects.assign_employee_roles';
                                
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
 
@@ -1490,16 +1490,6 @@
                        $subs           = get_var('subs',array('POST'));
                        $pa_id          = 
intval(get_var('pa_id',array('POST','GET')));
 
-                       switch($action)
-                       {
-                               case 'mains':   $deleteheader = lang('are you 
sure you want to delete this project');
-                                                               $header = 
lang('delete project');
-                                                               break;
-                               case 'subs':    $deleteheader = lang('are you 
sure you want to delete this job');
-                                                               $header = 
lang('delete job');
-                                                               break;
-                       }
-
                        $link_data = array
                        (
                                'menuaction'    => 
'projects.uiprojects.list_projects',
@@ -1508,6 +1498,11 @@
                                'action'                => $action
                        );
 
+                       if($pa_id==0 || 
!($this->boprojects->edit_perms(array('type' => 'delete','project_id' => 
$pa_id,'action' => $action,'main' => $pro_main))))
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                       }
+
                        if ($_POST['yes'])
                        {
                                $this->attachedFiles->delete_file($pa_id);
@@ -1520,6 +1515,16 @@
                                
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
 
+                       switch($action)
+                       {
+                               case 'mains':   $deleteheader = lang('are you 
sure you want to delete this project');
+                                                               $header = 
lang('delete project');
+                                                               break;
+                               case 'subs':    $deleteheader = lang('are you 
sure you want to delete this job');
+                                                               $header = 
lang('delete job');
+                                                               break;
+                       }
+
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('projects') . ': ' . $header
                                                                                
                                        . $this->admin_header_info();
 
@@ -1985,15 +1990,13 @@
                        $link_data = array
                        (
                                'menuaction'    => 
'projects.uiprojects.assign_employee_roles',
-                               'action'                => $action,
+                               'action'                => 'role',
                                'project_id'    => $project_id,
-                               's_id'                  => $s_id,
                                'referer'               => $referer
                        );
 
                        if ($_POST['save'])
                        {
-                               //$values['s_id']               = $s_id;
                                $values['project_id']   = $project_id;
                                $this->boprojects->save_employee_role($values);
                                
$GLOBALS['phpgw']->template->set_var('message',lang('assignment has been 
saved'));
@@ -2002,7 +2005,6 @@
                        if ($_POST['done'])
                        {
                                Header('Location: ' . $referer);
-                               
//$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
 
                        if ($_GET['delete'])