Changeset 36 for trunk/calendar

Timestamp:

06/29/07 15:18:52 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/calendar

Files:

• doc/change_log.txt (modified) (1 diff)
• inc/class.bocalendar.inc.php (modified) (8 diffs)
• inc/class.uicalendar.inc.php (modified) (4 diffs)
• setup/phpgw_pt-br.lang (modified) (previous)
• templates/celepar/js/edit_exmail.js (modified) (2 diffs)

trunk/calendar/doc/change_log.txt

@@ -2 +2 @@
 módulo Agenda de Eventos, e a partir da versão 29/11/2006 [0.9.17]
 Nilton Emilio Buhrer Neto.
+
+05/06/2007 - [0.9.2]
+- Adicionando funcionalidade de adicionar eventos externos, pelo email
+- Corrigido problema de carregar os usuários da organização selecionada, ao criar um compromisso.
 
 22/05/2007 - [0.9.2]

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

@@ -2687 +2687 @@
                         }
 
-                        if(!is_object($GLOBALS['phpgw']->send))
+                        /*if(!is_object($GLOBALS['phpgw']->send))
                         {
                                 $GLOBALS['phpgw']->send = CreateObject('phpgwapi.send');
-                        }
+                        }*/
                 //      $send = &$GLOBALS['phpgw']->send;
                         
@@ -2708 +2708 @@
                         foreach($to_notify as $userid => $statusid) 
                         {
-                        
+                                $mail->ClearAllRecipients();
+                                $mail->ClearAttachments();
+                                
                                 $userid = (int)$userid;
 
@@ -2731 +2733 @@
 
                                         $to = $preferences->email_address($userid);
+                                        
                                         if (empty($to) || $to[0] == '@' || $to[0] == '$')       // we have no valid email-address
                                         {
@@ -2945 +2948 @@
                                                         break;
                                         }
-                                        $mail->AddAddress(implode(",",$to));    
+                                        $mail->AddAddress($to);
                                         $mail->Body = $tmpbody;
                                         $mail->From = $sender;
@@ -2957 +2960 @@
                                         if(!$mail->Send())
                                         {
+                                                
                                                 $returncode=false;
                                         }
@@ -2991 +2995 @@
                                                 if($ex_participant)
                                                         $to[] = $ex_participant;
-                                }
-                                $mail->AddAddress(implode(",",$to));
+                                }               
+                                foreach($to as $i => $to_array)
+                                        $mail->AddAddress($to_array);
                                 $_body = explode("<hr size='1' width='100%'>",$tmpbody);
                                 $tmpbody = $_body[0];
@@ -2998 +3003 @@
                                 $tmpbody.= "<br>".lang("Summary").": ".$this->so->cal->event[title]."<br>";
                                 $tmpbody.= "<br>".lang("Start date").": ".$GLOBALS['phpgw']->common->show_date($starttime)."<br>".lang("End date").": ".$GLOBALS['phpgw']->common->show_date($endtime)."<br>";
-                                $tmpbody.= "<br><br><hr size='1' width='100%'><font color='red'>".lang("This message was sent by server. You must send a message to sender to confirm this event")."</font>";
-                        
+                                $tmpbody.= "<br><br><hr size='1' width='100%'><font color='red'>"
+                                .lang("This message was sent by server. You must send a message to sender to confirm this event")."<br>"
+                                .lang("This is an external event. Even if it added to your expresso its can be changed any time at all")."</font><br>";
+                                
+                                if ($GLOBALS['bocalendar']->so->cal->event[start][month] > 10)
+                                        $event_month=$GLOBALS['bocalendar']->so->cal->event[start][month];
+                                else
+                                        $event_month="0".$GLOBALS['bocalendar']->so->cal->event[start][month];
+                                $tmpbody .="<a href='../index.php?menuaction=calendar.uicalendar.add&date="
+                                .$GLOBALS['bocalendar']->so->cal->event[start][year]
+                                .$event_month
+                                .$GLOBALS['bocalendar']->so->cal->event[start][mday]
+                                ."&hour=".$GLOBALS['bocalendar']->so->cal->event[start][hour]
+                                ."&minute=".$GLOBALS['bocalendar']->so->cal->event[start][min]
+                                ."&title=".$GLOBALS['bocalendar']->so->cal->event['title']
+                                ."&description=".$GLOBALS['bocalendar']->so->cal->event['description']
+                                ."&location=".$GLOBALS['bocalendar']->so->cal->event['location']."'>"
+                                ."<h2>".lang("Add to my expresso")."</h2>";
+                                
                                 //attach extern vcard                   
                                 // define('context','$GLOBALS.bocalendar.so.cal.event');
@@ -3013 +3035 @@
                                 fclose($attach_fd);
                                 $mail->From = $sender;
-                                $mail->FromName = lang("Expresso external user").": ".$GLOBALS['phpgw_info']['user']['fullname'];
+                                $mail->FromName = $GLOBALS['phpgw_info']['user']['fullname'];
                                 $mail->Sender = $mail->From;
                                 $mail->SenderName = $mail->FromName;

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

@@ -1181 +1181 @@
                                 $endmin    = $startmin + (int)$this->bo->prefs['calendar']['defaultlength'];
                                 $endhour   = $starthour + $this->bo->normalizeminutes($endmin);
-                                ;
+                                
+                                $subject        = (string)(get_var('title',array('GET'),0));
+                                if ($subject != '0')
+                                {
+                                        $description    = (string)(get_var('description',array('GET'),0));
+                                        $location       = (string)(get_var('location',array('GET'),0));
+                                }
+                                else
+                                        unset($subject);
+                                
                                 $this->bo->set_start($this->bo->year,$this->bo->month,$this->bo->day,$starthour,$startmin,0);
                                 $this->bo->set_end($this->bo->year,$this->bo->month,$this->bo->day,$endhour,$endmin,0);
-                                $this->bo->set_title('');
-                                $this->bo->set_description('');
+                                $this->bo->set_title($subject);
+                                $this->bo->set_description($description);
+                                $this->bo->add_attribute('location',$location);
                                 $this->bo->set_ex_participants('');
-                                $this->bo->add_attribute('location','');
                                 $this->bo->add_attribute('uid','');
                                 $this->bo->add_attribute('priority',2);
@@ -4005 +4014 @@
                                                                                 $user_context[] = $dn_part;
                                                                 }
-                                                                $user_context = implode(",",$user_context);
-                                                                $combo_org = $this->get_organizations($context, trim(strtolower($user_context)));
+                                                                // Prepara o contexto do usuario com sua OU raiz, pois ele pode pertencer a uma OU de nivel N.
+                                                                $user_ou = explode(",",str_replace($context,"",implode(",",$user_context)));                                                            
+                                                                $user_context = trim(strtolower($user_ou[count($user_ou) - 2].",".$context));
+                                                                // Fim
+                                                                $combo_org = $this->get_sectors(trim(strtolower($user_context)));
                                                                 $footer_ext_participantes = lang("Tip: To search in the <b>Global Catalog</b>, type the <b>F9</b> key, like the ExpressoMail.");
                                                                 
@@ -4045 +4057 @@
                                                                                         "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ".                                                                                        
                                                                                         "<script type='text/javascript'>" .
-                                                                                        "setTimeout('get_available_users(\"".$module_name."\",\'".$user_context."\')',1000);" .
+                                                                                        "setTimeout('get_available_users(\"".$module_name."\",\'".$user_context."\')',1000);". 
                                                                                         "</script> "
                                                                                                 
@@ -4630 +4642 @@
                 }
 
-                function get_organizations($context, $selected='')
+                function get_sectors($selected='')
                 {
                         $s = CreateObject('phpgwapi.sector_search_ldap');
-                        $sectors_info = $s->get_organizations($context, $selected, false, false);
+                        $sectors_info = $s->get_sectors($selected, false, false);
                         return $sectors_info;
                 }
+                
                 /*
                 function get_organizations($context, $selected='')

trunk/calendar/templates/celepar/js/edit_exmail.js

@@ -52 +52 @@
                 }
                 var options = '###';
-                if (data) {                     
+                if (data) {
                         if(data.groups && data.groups.length > 0) {
                                 data.groups = '<option  value="-1" disabled>------------------- '+document.getElementById("txt_groups").value+' ------------------ </option>' + data.groups;
@@ -75 +75 @@
         }       
 
-        cExecute (path+'.ldap_functions.get_available_users&context='+context, handler_get_available_users);
+        document.getElementById('combo_org').value = context;
+        cExecute (path+'.ldap_functions.get_available_users&context='+context+'&type=search', handler_get_available_users);
 }
 function add_user()