Changeset 36 for trunk/calendar/inc/class.uicalendar.inc.php

Timestamp:

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

Author:

niltonneto

Message:

* empty log message *

File:

• trunk/calendar/inc/class.uicalendar.inc.php (modified) (4 diffs)

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='')