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

[nomail]

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

date: 2004/06/09 23:25:39;  author: ceb;  state: Exp;  lines: +25 -31

Log Message:
update
=====================================================================
Index: projects/inc/class.uiprojects.inc.php
diff -u projects/inc/class.uiprojects.inc.php:1.145 
projects/inc/class.uiprojects.inc.php:1.146
--- projects/inc/class.uiprojects.inc.php:1.145 Wed Jun  9 15:58:58 2004
+++ projects/inc/class.uiprojects.inc.php       Wed Jun  9 23:25:39 2004
@@ -752,7 +752,6 @@
 
                        if ($_POST['save'] || $_POST['apply'])
                        {
-                               //echo 'POST: SAVE';
                                $this->cat_id = 
($values['cat']?$values['cat']:'');
                                $values['coordinator']  = $_POST['accountid'];
                                $values['employees']    = $_POST['employees'];
@@ -782,7 +781,6 @@
                                                
$GLOBALS['phpgw']->template->set_var('message',lang('project %1 has been 
saved',$values['title']));
                                        }
                                }
-                               $radio_acc_factor = $values['radio_acc_factor'];
                        }
 
                        if($_POST['cancel'])
@@ -811,13 +809,21 @@
 
                        if($project_id)
                        {
-                               $values = 
$this->boprojects->read_single_project($project_id);
+                               if(!is_array($values))
+                               {
+                                       $values = 
$this->boprojects->read_single_project($project_id);
+                               }
+                               else
+                               {
+
+                               }
 
                                if(!is_array($values))
                                {
                                        
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                                }
                        }
+                               //_debug_array($values);
 
                        if ($action == 'mains')
                        {
@@ -884,18 +890,6 @@
 
                        if ($project_id)
                        {
-                               $values['radio_acc_factor'] = $radio_acc_factor;
-
-                               if(($_POST['save'] || $_POST['apply']) && 
$error)
-                               {
-                                       $values['coordinator']          = 
$_POST['accountid'];
-                                       $values['employees']            = 
$_POST['employees'];
-
-                                       $values['customer']                     
= $_POST['abid'];
-                                       $values['book_activities']      = 
$book_activities;
-                                       $values['bill_activities']      = 
$bill_activities;
-                               }
-
                                
$GLOBALS['phpgw']->template->set_var('old_status',$values['status']);
                                
$GLOBALS['phpgw']->template->set_var('old_parent',$values['parent']);
                                
$GLOBALS['phpgw']->template->set_var('old_edate',$values['edate']);
@@ -904,21 +898,21 @@
                                
$GLOBALS['phpgw']->template->set_var('choose','');
                                $this->cat_id = $values['cat'];
 
-                               $values['sday']         = 
$values['sdate']?date('d',$values['sdate']):0;
-                               $values['smonth']       = 
$values['sdate']?date('m',$values['sdate']):0;
-                               $values['syear']        = 
$values['sdate']?date('Y',$values['sdate']):0;
-
-                               $values['eday']         = 
$values['edate']?date('d',$values['edate']):0;
-                               $values['emonth']       = 
$values['edate']?date('m',$values['edate']):0;
-                               $values['eyear']        = 
$values['edate']?date('Y',$values['edate']):0;
-
-                               $values['psday']        = 
$values['psdate']?date('d',$values['psdate']):0;
-                               $values['psmonth']      = 
$values['psdate']?date('m',$values['psdate']):0;
-                               $values['psyear']       = 
$values['psdate']?date('Y',$values['psdate']):0;
-
-                               $values['peday']        = 
$values['pedate']?date('d',$values['pedate']):0;
-                               $values['pemonth']      = 
$values['pedate']?date('m',$values['pedate']):0;
-                               $values['peyear']       = 
$values['pedate']?date('Y',$values['pedate']):0;
+                               $values['sday']         = 
$values['sday']?$values['sday']:($values['sdate']?date('d',$values['sdate']):0);
+                               $values['smonth']       = 
$values['smonth']?$values['smonth']:($values['sdate']?date('m',$values['sdate']):0);
+                               $values['syear']        = 
$values['syear']?$values['syear']:($values['sdate']?date('Y',$values['sdate']):0);
+
+                               $values['eday']         = 
$values['eday']?$values['eday']:($values['edate']?date('d',$values['edate']):0);
+                               $values['emonth']       = 
$values['emonth']?$values['emonth']:($values['edate']?date('m',$values['edate']):0);
+                               $values['eyear']        = 
$values['eyear']?$values['eyear']:($values['edate']?date('Y',$values['edate']):0);
+
+                               $values['psday']        = 
$values['psday']?$values['psday']:($values['psdate']?date('d',$values['psdate']):0);
+                               $values['psmonth']      = 
$values['psmonth']?$values['psmonth']:($values['psdate']?date('m',$values['psdate']):0);
+                               $values['psyear']       = 
$values['psyear']?$values['psyear']:($values['psdate']?date('Y',$values['psdate']):0);
+
+                               $values['peday']        = 
$values['peday']?$values['peday']:($values['pedate']?date('d',$values['pedate']):0);
+                               $values['pemonth']      = 
$values['pemonth']?$values['pemonth']:($values['pedate']?date('m',$values['pedate']):0);
+                               $values['peyear']       = 
$values['peyear']?$values['peyear']:($values['pedate']?date('Y',$values['pedate']):0);
 
                                
$GLOBALS['phpgw']->template->set_var('edit_mstones_button','<input 
type="submit" name="mstone" value="' . lang('edit milestones') . '">');
                                
$GLOBALS['phpgw']->template->set_var('edit_roles_events_button','<input 
type="submit" name="roles" value="' . lang('edit roles and events') . '">');