[Netoffice-cvs-2x] netoffice-2.x/includes notification.class.php,1.2,1.3

[Scott M. <ma...@us...>]

Update of /cvsroot/netoffice/netoffice-2.x/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5523/includes

Modified Files:
	notification.class.php 
Log Message:
various bug fixes

Index: notification.class.php
===================================================================
RCS file: /cvsroot/netoffice/netoffice-2.x/includes/notification.class.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** notification.class.php	17 Dec 2004 10:56:28 -0000	1.2
--- notification.class.php	27 May 2005 19:42:52 -0000	1.3
***************
*** 47,52 ****
              $this->AddAddress($detailUser->mem_email_work[0], $detailUser->mem_name[0]);
          } 
!     } 
! } 
  
  ?>
\ No newline at end of file
--- 47,119 ----
              $this->AddAddress($detailUser->mem_email_work[0], $detailUser->mem_name[0]);
          } 
!     }
!     
!     function taskNotification($pAssigneeID, $pTaskID, $pTypeOfChange)
!     {
!         if ($num == '') {
!             $num = $id;
!         }
!         
!         $tmpquery = "WHERE tas.id IN($pTaskID)";
!         $taskNoti = new request();
!         $taskNoti->openTasks($tmpquery);
! 
!         $tmpquery = "WHERE pro.id = '$project'";
!         $projectNoti = new request();
!         $projectNoti->openProjects($tmpquery);
! 
!         $tmpquery = "WHERE noti.member IN ($pAssigneeID)";
!         $listNotifications = new request();
!         $listNotifications->openNotifications($tmpquery);
!         $comptListNotifications = count($listNotifications->not_id);
! 
!         if ($listNotifications->not_taskassignment[0] == "0") {
!             $this->getUserinfo($idSession, "from");
! 
!             $this->partSubject = $strings["noti_taskassignment1"];
!             $this->partMessage = $strings["noti_taskassignment2"];
! 
!             if ($projectNoti->pro_org_id[0] == "1") {
!                 $projectNoti->pro_org_name[0] = $strings["none"];
!             }
! 
!             $complValue = ($taskNoti->tas_completion[0] > 0) ? $taskNoti->tas_completion[0] . "0 %" : $taskNoti->tas_completion[0] . " %";
!             $idStatus = $taskNoti->tas_status[0];
!             $idPriority = $taskNoti->tas_priority[0];
! 
!             $body = $this->partMessage . "\n\n" . $strings["task"] . " : " . 
!                     $taskNoti->tas_name[0] . "\n" . $strings["start_date"] . " : " . 
!                     $taskNoti->tas_start_date[0] . "\n" . $strings["due_date"] . " : " . 
!                     $taskNoti->tas_due_date[0] . "\n" . $strings["completion"] . " : " . 
!                     $complValue . "\n" . $strings["priority"] . " : $priority[$idPriority]\n" . 
!                     $strings["status"] . " : $status[$idStatus]\n" . $strings["description"] . " : " . 
!                     $taskNoti->tas_description[0] . "\n\n" . $strings["project"] . " : " . 
!                     $projectNoti->pro_name[0] . " (" . $projectNoti->pro_id[0] . ")\n" . 
!                     $strings["organization"] . " : " . $projectNoti->pro_org_name[0] . "\n\n" . 
!                     $strings["noti_moreinfo"]."\n";
! 
!             if ($taskNoti->tas_mem_organization[0] == "1") {
!                 $body .= "$root/general/login.php?url=tasks/viewtask.php%3Fid=$num";
!             } else if ($taskNoti->tas_mem_organization[0] != "1" && $projectNoti->pro_published[0] == "0" && $taskNoti->tas_published[0] == "0") {
!                 $body .= "$root/general/login.php?url=projects_site/home.php%3Fproject=" . $projectNoti->pro_id[0];
!             }
! 
!             $body .= "\n\n" . $this->footer;
!             $subject = $this->partSubject . " " . $taskNoti->tas_name[0];
!             $this->Subject = $subject;
!             
!             if ($taskNoti->tas_priority[0] == "4" || $taskNoti->tas_priority[0] == "5") {
!                 $this->Priority = "1";
!             } else {
!                 $this->Priority = "3";
!             }
! 
!             $this->Body = $body;
!             $this->AddAddress($listNotifications->not_mem_email_work[0], $listNotifications->not_mem_name[0]);
!             $this->Send();
!             $this->ClearAddresses();
!         }
!     }
! }
  
  ?>
\ No newline at end of file