Changeset 1720

Timestamp:

11/27/09 15:43:28 (14 years ago)

Author:

eduardoalex

Message:

Ticket #682 - Adicionada verificacao se o delegado ja esta no evento

Location:

trunk/calendar/inc

Files:

• class.bocalendar.inc.php (modified) (1 diff)
• class.uicalendar.inc.php (modified) (1 diff)

trunk/calendar/inc/class.bocalendar.inc.php

@@ -383 +383 @@
 
                         $this->so->cal->stream->lock(array("phpgw_cal_user"));
-                        $sql = "update phpgw_cal_user set cal_login = $idDelegado,cal_status='U' where cal_id=$idEvento 
-                                        and cal_login=$idDelegador";
-
-                        $this->so->cal->stream->query($sql,__LINE__,__FILE__,0,-1,true);
-
+                        $sql = "SELECT * FROM phpgw_cal_user where cal_id=$idEvento and cal_login=$idDelegado";
+                        
+                        $this->so->cal->stream->query($sql,__LINE__,__FILE__);
+                        if($this->so->cal->stream->next_record())
+                        {
+                                throw new Exception("The selected User is already included in this event");
+                        }else{
+                                $sql = "update phpgw_cal_user set cal_login = $idDelegado,cal_status='U' where cal_id=$idEvento 
+                                                and cal_login=$idDelegador";
+
+                                $this->so->cal->stream->query($sql,__LINE__,__FILE__,0,-1,true);
+                                
+                                $event = $this->so->read_entry($idEvento);
+
+                                $this->send_update(MSG_ADDED,array($idDelegado => 'U'),$event,$event);
+                        }
                         $this->so->cal->stream->unlock();
-                        $event = $this->so->read_entry($idEvento);
-                        /*foreach($event as $id=>$value)
-                                echo "<br>".$id."  --  ".$value;
-                        exit(0);*/
-                        $this->send_update(MSG_ADDED,array($idDelegado => 'U'),$event,$event);
                 }
 

trunk/calendar/inc/class.uicalendar.inc.php

@@ -232 +232 @@
 
                 function delegate_event($params=NULL) {
-                        //$ldap = CreateObject('expressoMail1_2.ldap_functions');
-                        //$delegated = $ldap->uid2uidnumber($_REQUEST['delegated']);
-system('echo "request[date]: '.$_REQUEST['date'].'" >>/tmp/controle');
+                        $ldap = CreateObject('expressoMail1_2.ldap_functions');
+                        $delegated = $ldap->uid2uidnumber($_REQUEST['delegated']);
+
                         try {
-                                $this->bo->delegar($_REQUEST['delegator'],$_REQUEST['delegated']/*$delegated*/,$_REQUEST['event']);
+                                $this->bo->delegar($_REQUEST['delegator'],$ldap->uid2uidnumber($_REQUEST['delegated'])/*$delegated*/,$_REQUEST['event']);
                                 header("Location: index.php?menuaction=calendar.uicalendar.day&date=".$_REQUEST['date']);
                         }catch(Exception $e) {
                                 header("Location: index.php?menuaction=calendar.uicalendar.screen_delegate_event&id_event=". $_REQUEST["event"]."&delegator=".$_REQUEST["delegator"]."&date=".$_REQUEST["date"]."&error=1");
                         }
-
-
                 }