[Phpgroupware-cvs] calendar inc/class.bocalendar.inc.php inc/class...

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    calendar
Changes by:     Dave Hall <skwashd>     06/07/28 03:21:07

Modified files:
        inc            : class.bocalendar.inc.php 
                         class.uicalendar.inc.php 
        setup          : phpgw_en.lang 

Log message:
        last changes before breaking 16 compat

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.104&r2=1.105
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/calendar/setup/phpgw_en.lang?cvsroot=phpgroupware&r1=1.33&r2=1.34

Patches:
Index: inc/class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- inc/class.bocalendar.inc.php        5 Jun 2006 12:11:03 -0000       1.104
+++ inc/class.bocalendar.inc.php        28 Jul 2006 03:21:07 -0000      1.105
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.bocalendar.inc.php,v 1.104 2006/06/05 12:11:03 skwashd 
Exp $ */
+       /* $Id: class.bocalendar.inc.php,v 1.105 2006/07/28 03:21:07 skwashd 
Exp $ */
 
        class bocalendar
        {
@@ -3111,13 +3111,14 @@
                */
                function get_per_contacts($lookup, $cat_id)
                {
+                       //echo "lookup == $lookup and user_id == 
{$GLOBALS['phpgw_info']['user']['account_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_last_name', $lookup);
 
                        $criteria[] = 
sql_criteria::_append_or($criteria_search);
-                       $criteria[] = 
$this->contacts->criteria_for_index($GLOBALS['phpgw_info']['user']['account_id']);
+                       $criteria[] = $this->contacts->criteria_for_index((int) 
$GLOBALS['phpgw_info']['user']['account_id']);
 
                        if ( $cat_id )
                        {

Index: inc/class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- inc/class.uicalendar.inc.php        12 Jun 2006 06:55:42 -0000      1.123
+++ inc/class.uicalendar.inc.php        28 Jul 2006 03:21:07 -0000      1.124
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uicalendar.inc.php,v 1.123 2006/06/12 06:55:42 sigurdne 
Exp $ */
+       /* $Id: class.uicalendar.inc.php,v 1.124 2006/07/28 03:21:07 skwashd 
Exp $ */
 
        class uicalendar
        {
@@ -2912,7 +2912,7 @@
 
                        $date = 
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->mday);
                        $var = array(
-                               'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.bocalendar.update','readsess'=>1)),
+                               'action_url_button'             => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'calendar.bocalendar.update', 'readsess' => 1)),
                                'action_text_button'    => lang('Ignore 
Conflict'),
                                'action_confirm_button' => '',
                                'action_extra_field'    => ''
@@ -3798,6 +3798,11 @@
                                                        break;
                                                default: //assume person
                                                        $contacts = 
$this->bo->get_per_contacts($_GET['lookup'], $cat_id);
+                                                       if ( 
!is_array($contacts) || !count($contacts) )
+                                                       {
+                                                               return '';
+                                                       }
+                                                       
                                                        foreach ( $contacts as 
$contact )
                                                        {
                                                                echo "<option 
value=\"{$contact['contact_id']}\">{$contact['per_first_name']} 
{$contact['per_last_name']}</option>\n";
@@ -3911,7 +3916,7 @@
                                'font'                  => $this->theme['font'],
                                'bg_color'              => 
$this->theme['bg_text'],
                                'action_url'            => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.bocalendar.update')),
-                               'popup_url'             => 
$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uicalendar.participants_popup'),
+                               'popup_url'             => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'calendar.uicalendar.participants_popup'), true),
                                'common_hidden' => '<input type="hidden" 
name="cal[id]" value="'.$event['id'].'" />'."\n"
                                                                                
. '<input type="hidden" name="cal[owner]" value="'.$event['owner'].'" />'."\n"
                                                                                
. '<input type="hidden" name="recur_exception" value="'.$recur_exception.'" 
/>'."\n"

Index: setup/phpgw_en.lang
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/setup/phpgw_en.lang,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- setup/phpgw_en.lang 5 Jun 2006 12:11:03 -0000       1.33
+++ setup/phpgw_en.lang 28 Jul 2006 03:21:07 -0000      1.34
@@ -258,7 +258,7 @@
 this week      calendar        en      This week
 this year      calendar        en      This year
 thu    calendar        en      Thu
-title  calendar        en      TITLE
+title  calendar        en      Title
 title of the event     calendar        en      Title of the event
 title-row      calendar        en      Title-row
 to-firstname   calendar        en      To-Firstname