phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.21,


From: Ralf Becker <address@hidden>
Subject: [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.21,1.71.2.22 class.uicalendar.inc.php,1.66.2.34,1.66.2.35
Date: Thu, 31 Oct 2002 04:47:14 -0500

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv28373

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php class.uicalendar.inc.php 
Log Message:
fix for session in url

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.21
retrieving revision 1.71.2.22
diff -C2 -r1.71.2.21 -r1.71.2.22
*** class.bocalendar.inc.php    31 Oct 2002 00:57:23 -0000      1.71.2.21
--- class.bocalendar.inc.php    31 Oct 2002 09:47:12 -0000      1.71.2.22
***************
*** 882,886 ****
                                        if ($this->return_to)
                                        {
!                                               header('Location: 
'.$GLOBALS['phpgw']->link("/index.php?menuaction=$this->return_to"));
                                                
$GLOBALS['phpgw']->common->phpgw_exit();
                                        }
--- 882,886 ----
                                        if ($this->return_to)
                                        {
!                                               header('Location: 
'.$GLOBALS['phpgw']->link("/index.php','menuaction=$this->return_to"));
                                                
$GLOBALS['phpgw']->common->phpgw_exit();
                                        }

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.34
retrieving revision 1.66.2.35
diff -C2 -r1.66.2.34 -r1.66.2.35
*** class.uicalendar.inc.php    31 Oct 2002 02:00:24 -0000      1.66.2.34
--- class.uicalendar.inc.php    31 Oct 2002 09:47:12 -0000      1.66.2.35
***************
*** 828,832 ****
                        {
                                $var = Array(
!                                       'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to),
                                        'action_text_button'    => lang('Done'),
                                        'action_confirm_button' => '',
--- 828,832 ----
                        {
                                $var = Array(
!                                       'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to),
                                        'action_text_button'    => lang('Done'),
                                        'action_confirm_button' => '',
***************
*** 961,965 ****
                                if ($this->bo->return_to)
                                {
!                                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to));
                                }
                                else
--- 961,965 ----
                                if ($this->bo->return_to)
                                {
!                                       Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
                                }
                                else
***************
*** 1049,1053 ****
  
                        $var = Array(
!                               'action_url_button'     => $this->bo->return_to 
? $GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to) : 
$this->page(''),
                                'action_text_button'    => lang('Cancel'),
                                'action_confirm_button' => '',
--- 1049,1053 ----
  
                        $var = Array(
!                               'action_url_button'     => $this->bo->return_to 
? $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to) : 
$this->page(''),
                                'action_text_button'    => lang('Cancel'),
                                'action_confirm_button' => '',
***************
*** 1089,1093 ****
                        if ($this->bo->return_to)
                        {
!                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to));
                        }                       
                        else
--- 1089,1093 ----
                        if ($this->bo->return_to)
                        {
!                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
                        }                       
                        else
***************
*** 1185,1189 ****
                        if ($this->bo->return_to)
                        {
!                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to));
                        }
                        else
--- 1185,1189 ----
                        if ($this->bo->return_to)
                        {
!                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
                        }
                        else
***************
*** 1313,1317 ****
                        if ($this->bo->return_to)
                        {
!                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to));
                        }
                        else
--- 1313,1317 ----
                        if ($this->bo->return_to)
                        {
!                               Header('Location: 
'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to));
                        }
                        else
***************
*** 1429,1434 ****
                                                $prev_month = 
sprintf(\'%04d%02d01\',$y-($m==1),$m > 1?$m-1:12);
                                                $next_month = 
sprintf(\'%04d%02d01\',$y+($m==12),$m < 12?$m+1:1);
!                                               $prev_link = 
$GLOBALS[\'phpgw\']->link("/index.php?menuaction=calendar.uicalendar.planner&date=$prev_month");
!                                               $next_link = 
$GLOBALS[\'phpgw\']->link("/index.php?menuaction=calendar.uicalendar.planner&date=$next_month");
                                                $hdr[0][$i] = "<b><a 
href=\"$prev_link\">&lt;&lt;</a> &nbsp $month &nbsp <a 
href=\"$next_link\">&gt;&gt;</a></b>";
  
--- 1429,1434 ----
                                                $prev_month = 
sprintf(\'%04d%02d01\',$y-($m==1),$m > 1?$m-1:12);
                                                $next_month = 
sprintf(\'%04d%02d01\',$y+($m==12),$m < 12?$m+1:1);
!                                               $prev_link = 
$GLOBALS[\'phpgw\']->link(\'/index.php\',"menuaction=calendar.uicalendar.planner&date=$prev_month");
!                                               $next_link = 
$GLOBALS[\'phpgw\']->link(\'/index.php\',"menuaction=calendar.uicalendar.planner&date=$next_month");
                                                $hdr[0][$i] = "<b><a 
href=\"$prev_link\">&lt;&lt;</a> &nbsp $month &nbsp <a 
href=\"$next_link\">&gt;&gt;</a></b>";
  
***************
*** 3804,3808 ****
                        {
                                $var = Array(
!                                       'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php?menuaction='.$this->bo->return_to),
                                        'action_text_button'    => 
lang('cancel'),
                                        'action_confirm_button' => '',
--- 3804,3808 ----
                        {
                                $var = Array(
!                                       'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to),
                                        'action_text_button'    => 
lang('cancel'),
                                        'action_confirm_button' => '',





reply via email to

[Prev in Thread] Current Thread [Next in Thread]