[Phpgroupware-cvs] infolog/inc class.soinfolog.inc.php, 1.23 class.uiinfolog.inc.php, 1.76 class.bolink.inc.php, 1.23 class.boinfolog.inc.php, 1.38

[ceb]

Update of infolog/inc

Modified Files:
     Branch: MAIN
            class.soinfolog.inc.php lines: +13 -9
            class.uiinfolog.inc.php lines: +11 -8
            class.bolink.inc.php lines: +0 -0
            class.boinfolog.inc.php lines: +16 -19

Log Message:
update

====================================================
Index: infolog/inc/class.soinfolog.inc.php
diff -u infolog/inc/class.soinfolog.inc.php:1.22 
infolog/inc/class.soinfolog.inc.php:1.23
--- infolog/inc/class.soinfolog.inc.php:1.22    Wed Jan  5 22:07:58 2005
+++ infolog/inc/class.soinfolog.inc.php Thu Jan  6 23:24:53 2005
@@ -75,16 +75,20 @@

                        $owner = $info['info_owner'];

-                       if($required_rights == 'confirm' && 
($info['info_confirm'] == 'accept' || $info['info_confirm'] == 'both'))
+                       if(intval($info['info_responsible']) > 0 && $owner != 
$info['info_responsible'] && $owner != $this->user && $info['info_responsible'] 
== $this->user)
                        {
-                               $access_ok = (intval($info['info_responsible']) 
> 0 && $info['info_responsible'] != $owner && $info['info_responsible'] == 
$this->user && $info['info_confirm_status'] == 'not');
-                               return $access_ok;
-                       }
+                               if($required_rights == 'confirm' && 
($info['info_confirm'] == 'accept' || $info['info_confirm'] == 'both'))
+                               {
+                                       $access_ok = 
($info['info_confirm_status'] == 'not');
+                                       return $access_ok;
+                               }

-                       if($required_rights == 'finish' && 
($info['info_confirm'] == 'finish' || $info['info_confirm'] == 'both'))
-                       {
-                               $access_ok = (intval($info['info_responsible']) 
> 0 && $info['info_responsible'] != $owner && $info['info_responsible'] == 
$this->user && $info['info_confirm_status'] != 'finished');
-                               return $access_ok;
+                               if($required_rights == 'finish' && 
($info['info_confirm'] == 'finish' || $info['info_confirm'] == 'both'))
+                               {
+                                       $access_ok = 
($info['info_confirm_status'] != 'finished');
+                                       return $access_ok;
+                               }
+                               return False;
                        }

                        $access_ok = $owner == $this->user ||                // 
user has all rights

====================================================
Index: infolog/inc/class.uiinfolog.inc.php
diff -u infolog/inc/class.uiinfolog.inc.php:1.75 
infolog/inc/class.uiinfolog.inc.php:1.76
--- infolog/inc/class.uiinfolog.inc.php:1.75    Wed Jan  5 22:07:58 2005
+++ infolog/inc/class.uiinfolog.inc.php Thu Jan  6 23:24:53 2005
@@ -344,7 +344,7 @@
                                {
                                        if ($content['save'] && (!$info_id || 
$this->bo->check_access($info_id,PHPGW_ACL_EDIT)))
                                        {
-                                               $content['old_responsible']     
        = $this->bo->so->data['info_responsible'];
+                                               $content['old_responsible'] = 
$this->bo->so->data['info_responsible'];

                                                if 
(strstr($content['info_link_id'],':') !== False)
                                                {
@@ -373,13 +373,16 @@

                                                if($this->bo->emailnotification)
                                                {
-                                                       if(!$info_id && 
intval($content['info_responsible']) > 0 && $content['info_responsible'] != 
$content['info_owner'])
+                                                       
if(intval($content['info_responsible']) > 0 && $content['info_responsible'] != 
$content['info_owner'])
                                                        {
-                                                               
$this->bo->send_notification($content);
-                                                       }
-                                                       
elseif(intval($content['info_responsible']) != $content['old_responsible'] && 
$content['info_responsible'] != $content['info_owner'])
-                                                       {
-                                                               
$this->bo->send_notification($content);
+                                                               if(!$info_id)
+                                                               {
+                                                                       
$this->bo->send_notification($content);
+                                                               }
+                                                               
elseif(intval($content['info_responsible']) != $content['old_responsible'])
+                                                               {
+                                                                       
$this->bo->send_notification($content);
+                                                               }
                                                        }
                                                }
                                        }

====================================================

====================================================
Index: infolog/inc/class.boinfolog.inc.php
diff -u infolog/inc/class.boinfolog.inc.php:1.37 
infolog/inc/class.boinfolog.inc.php:1.38
--- infolog/inc/class.boinfolog.inc.php:1.37    Wed Jan  5 22:07:58 2005
+++ infolog/inc/class.boinfolog.inc.php Thu Jan  6 23:24:53 2005
@@ -293,26 +293,23 @@

                                //echo 'boinfolog:send_notification: ' . 
_debug_array($content);

-                               if(intval($content['info_responsible']) > 0 && 
$content['info_responsible'] != $content['info_owner'])
+                               switch($content['info_confirm'])
                                {
-                                       switch($content['info_confirm'])
-                                       {
-                                               case 'accept':
-                                                       $send = 
($content['info_confirm_status'] == 'accepted'?True:False);
-                                                       break;
-                                               case 'finish':
-                                                       $send = 
($content['info_confirm_status'] == 'finished'?True:False);
-                                                       break;
-                                               case 'both':
-                                                       $send = 
(($content['info_confirm_status'] == 'accepted' || 
$content['info_confirm_status'] == 'finished')?True:False);
-                                                       break;
-                                       }
+                                       case 'accept':
+                                               $send = 
($content['info_confirm_status'] == 'accepted'?True:False);
+                                               break;
+                                       case 'finish':
+                                               $send = 
($content['info_confirm_status'] == 'finished'?True:False);
+                                               break;
+                                       case 'both':
+                                               $send = 
(($content['info_confirm_status'] == 'accepted' || 
$content['info_confirm_status'] == 'finished')?True:False);
+                                               break;
                                }
-                       }

-                       if(!$send)
-                       {
-                               return False;
+                               if(!$send)
+                               {
+                                       return False;
+                               }
                        }

                        $msg = lang('subject') . ': ' . 
$content['info_subject'] . "\n";
@@ -388,7 +385,7 @@
                                //echo "<p>infolog::send_notification: Empty 
email adress for user '".$emp_events[$k]['emp_name']."' ==> ignored !!!</p>\n";
                                continue;
                        }*/
-                       //echo 'Email being sent to ' . $to;
+                       echo 'Email being sent to ' . $to;

                        $subject = 
$GLOBALS['phpgw']->send->encode_subject($subject);