[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, 1.116 class.bocalendar.inc.php, 1.97

[skwashd]

Update of calendar/inc

Modified Files:
     Branch: MAIN
            class.uicalendar.inc.php lines: +30 -11
            class.bocalendar.inc.php lines: +31 -5

Log Message:
added the ability to invite an org to an event, as requested

====================================================
Index: calendar/inc/class.uicalendar.inc.php
diff -u calendar/inc/class.uicalendar.inc.php:1.115 
calendar/inc/class.uicalendar.inc.php:1.116
--- calendar/inc/class.uicalendar.inc.php:1.115 Mon Nov  7 00:20:50 2005
+++ calendar/inc/class.uicalendar.inc.php       Fri Nov 11 10:18:21 2005
@@ -3565,17 +3565,33 @@
                                if ( $cat_id == -1 ) //groups
                                {
                                        $contacts = 
$this->bo->get_groups($_GET['lookup']);
+                                       foreach ( $contacts as $contact )
+                                       {
+                                               echo "<option 
value=\"{$contact['contact_id']}\">{$contact['per_first_name']} 
{$contact['per_last_name']} (g)</option>\n";
+                                       }
                                }
                                else
                                {
-                                       $contacts = 
$this->bo->get_contacts($_GET['lookup'], $cat_id);
+                                       switch( $_GET['con_type'] )
+                                       {
+
+                                               case 2: //orgs
+                                                       $contacts = 
$this->bo->get_org_contacts($_GET['lookup'], $cat_id);
+                                                       foreach ( $contacts as 
$contact )
+                                                       {
+                                                               echo "<option 
value=\"{$contact['contact_id']}\">{$contact['org_name']} (o)</option>\n";
+                                                       }
+                                                       break;
+                                               default: //assume person
+                                                       $contacts = 
$this->bo->get_per_contacts($_GET['lookup'], $cat_id);
+                                                       foreach ( $contacts as 
$contact )
+                                                       {
+                                                               echo "<option 
value=\"{$contact['contact_id']}\">{$contact['per_first_name']} 
{$contact['per_last_name']}</option>\n";
+                                                       }
+                                       }
                                }


-                               foreach ( $contacts as $contact )
-                               {
-                                       echo "<option 
value=\"{$contact['contact_id']}\">{$contact['per_first_name']} 
{$contact['per_last_name']}</option>\n";
-                               }
                                $GLOBALS['phpgw']->common->phpgw_exit();
                        }

@@ -3609,14 +3625,17 @@
                                (
                                        'base_url'              => 
$GLOBALS['phpgw']->link('/'),
                                        'lang_all'              => lang('all'),
-                                       'lang_title'            => 
lang('calendar event participants selector'),
-                                       'lang_show_contacts'    => lang('show 
contacts'),
+                                       'lang_add'              => lang('add'),
                                        'lang_category'         => 
lang('category'),
-                                       'lang_search'           => 
lang('search'),
+                                       'lang_close'            => 
lang('close'),
                                        'lang_contacts'         => 
lang('contacts'),
-                                       'lang_add'              => lang('add'),
+                                       'lang_org'              => 
lang('organization'),
+                                       'lang_person'           => 
lang('person'),
                                        'lang_remove'           => 
lang('remove'),
-                                       'lang_close'            => 
lang('close'),
+                                       'lang_show_contacts'    => lang('show 
contacts'),
+                                       'lang_search'           => 
lang('search'),
+                                       'lang_title'            => 
lang('calendar event participants selector'),
+                                       'lang_type'             => lang('type'),
                                        'img_add'               => 
$GLOBALS['phpgw']->common->image('calendar', 'right-24x24'),
                                        'img_remove'            => 
$GLOBALS['phpgw']->common->image('calendar', 'left-24x24'),
                                        'img_close'             => 
$GLOBALS['phpgw']->common->image('calendar', 'close-24x24')

====================================================
Index: calendar/inc/class.bocalendar.inc.php
diff -u calendar/inc/class.bocalendar.inc.php:1.96 
calendar/inc/class.bocalendar.inc.php:1.97
--- calendar/inc/class.bocalendar.inc.php:1.96  Mon Nov  7 00:20:50 2005
+++ calendar/inc/class.bocalendar.inc.php       Fri Nov 11 10:18:21 2005
@@ -2838,7 +2838,7 @@
                        {
                                foreach($event['participants'] as $user => 
$short_status)
                                {
-                                       $participants[$user] = 
$GLOBALS['phpgw']->contacts->get_name_of_person_id($user).' 
('.$this->get_long_status($short_status).')';
+                                       $participants[$user] = 
$GLOBALS['phpgw']->contacts->get_contact_name($user).' 
('.$this->get_long_status($short_status).')';
                                }
                        }
                        $var['participants'] = array(
@@ -2989,18 +2989,44 @@
                }

                /**
-               * Search for a list of contacts based on their [first|last]name
+               * Search for a list of organization contacts based on their 
[first|last]name
                *
                * @author skwashd
                * @param string $lookup the name to search for
                * @param int $cat_id the category to limit the search to
                * @returns array contacts found
                */
-               function get_contacts($lookup, $cat_id)
+               function get_org_contacts($lookup, $cat_id)
+               {
+                       $fields = array ('contact_id', 'org_name');
+
+                       $criteria_search[] = 
sql_criteria::token_begin('org_name', $lookup);
+
+                       $criteria[] = 
sql_criteria::_append_or($criteria_search);
+                       $criteria[] = 
$this->contacts->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id']);
+
+                       if ( $cat_id )
+                       {
+                               $criteria[] = sql_criteria::_equal('cat_id', 
$_GET['cat_id']);
+                       }
+
+                       $criteria_token = sql_criteria::_append_and($criteria);
+                       return $this->contacts->get_orgs($fields, 0, 0, 
'org_name', 'ASC', '', $criteria_token);
+               }
+
+               /**
+               * Search for a list of person contacts based on their 
[first|last]name
+               *
+               * @author skwashd
+               * @param string $lookup the name to search for
+               * @param int $cat_id the category to limit the search to
+               * @returns array contacts found
+               */
+               function get_per_contacts($lookup, $cat_id)
                {
                        $fields = array ('contact_id', 'per_first_name', 
'per_last_name');

-                       $criteria_search[] = sql_criteria::token_begin( 
'per_first_name', $lookup);
+                       $criteria_search[] = 
sql_criteria::token_begin('per_first_name', $lookup);
                        $criteria_search[] = 
sql_criteria::token_begin('per_last_name', $lookup);

                        $criteria[] = 
sql_criteria::_append_or($criteria_search);