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

Timestamp:

07/27/07 16:54:47 (17 years ago)

Author:

niltonneto

Message:

Vide arquivo change_log.txt

File:

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

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

@@ -4017 +4017 @@
                                                                 $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)));
+                                                                // Fim          
+                                                                // Verifica o tipo da visualização da árvore LDAP, configurado no admin da Agenda
+                                                                $recursive = $GLOBALS['phpgw_info']['server']['cal_type_tree_participants'] == '1' ? true : false;
+                                                                $combo_org = $this->get_organizations(trim(strtolower($context)),$user_context, $recursive);
                                                                 $footer_ext_participantes = lang("Tip: To search in the <b>Global Catalog</b>, type the <b>F9</b> key, like the ExpressoMail.");
                                                                 
@@ -4040 +4042 @@
                                                                                         '<td valign="bottom">'.
                                                                                         '       '.lang("Organization").': '.
-                                                                                        '       <select name="org_context" id="combo_org" onchange="javascript:get_available_users(\''.$module_name.'\',this.value);">'.$combo_org.'</select>'.
+                                                                                        '       <select name="org_context" id="combo_org" onchange="javascript:get_available_users(\''.$module_name.'\',this.value,\''.($recursive ? "" : "search").'\');">'.$combo_org.'</select>'.
                                                                                         '       <br>'.
                                                                                         '       <font color="red"><span id="cal_span_searching">&nbsp;</span></font>'.                                                                  
@@ -4057 +4059 @@
                                                                                         "<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."\',\'".($recursive ? "" : "search")."\')',1000);". 
                                                                                         "</script> "
                                                                                                 
@@ -4641 +4643 @@
                         return $daily;
                 }
-
-                function get_sectors($selected='')
+                
+                function get_organizations($context, $selected='', $recursive = false)
                 {
                         $s = CreateObject('phpgwapi.sector_search_ldap');
-                        $sectors_info = $s->get_sectors($selected, false, false);
-                        return $sectors_info;
-                }
-                
-                /*
-                function get_organizations($context, $selected='')
-                {
-                        $first_sector_ufn = ldap_dn2ufn($context);
-                        $first_sector_string = split(",", $first_sector_ufn);
-
-                        $s = CreateObject('phpgwapi.sector_search_ldap');
-                        $sectors_info = $s->sector_search($context);
-
-                        $sector_select = "";
-                        $sector_select .= "<option value='" .$context . "'";
-                        $sector_select .= ">".$first_sector_string[0]."</option>\n";
-                        
-                        foreach($sectors_info as $sector)
-                        {
-                                if ($sector->sector_level == 1)
-                                {
-                                        $sector->sector_name = '+ '.$sector->sector_name;
-                                }
-                                else
-                                {
-                                        $sector_space = '';
-                                        for ($i=1; $i < $sector->sector_level; $i++)
-                                                $sector_space = '---'.$sector_space;
-                                        $sector->sector_name = $sector_space.' '.$sector->sector_name;
-                                }
-                                $sector_select .= '<option value="' . $sector->sector_context . '"';
-                                
-                                if (trim(strtolower($sector->sector_context)) == $selected)
-                                        $sector_select .= ' selected>' . $sector->sector_name . "</option>\n";
-                                else
-                                        $sector_select .= '>' . $sector->sector_name . "</option>\n";
-                        }
-                        //$sector_select .= "</select>";
-                        return $sector_select;  
-                }
-                */
+                                                
+                        return ($recursive ? 
+                                $s->get_organizations($context, $selected, false ,false) :
+                                $s->get_sectors($selected, false, false));
+                }               
         }
 ?>