[Phpgroupware-cvs] calendar ical.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    calendar
Changes by:     Dave Hall <skwashd>     06/06/25 23:42:04

Modified files:
        .              : ical.php 

Log message:
        fixed code flow

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/ical.php?cvsroot=phpgroupware&r1=1.6&r2=1.7

Patches:
Index: ical.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/ical.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ical.php    5 Jun 2006 12:01:36 -0000       1.6
+++ ical.php    25 Jun 2006 23:42:04 -0000      1.7
@@ -12,7 +12,7 @@
        *  option) any later version.                                           
   *
        
\**************************************************************************/
 
-       /* $Id: ical.php,v 1.6 2006/06/05 12:01:36 skwashd Exp $ */
+       /* $Id: ical.php,v 1.7 2006/06/25 23:42:04 skwashd Exp $ */
 
        /**
        * NOTES:
@@ -88,23 +88,6 @@
        $so = createObject('calendar.socalendar', array('owner' => $uid) );
        $export = createObject('calendar.boicalendar');
 
-       $ical_mode = (isset($_GET['mode']) && strlen($_GET['mode']) ) ? 
$_GET['mode'] : 'freebusy';
-
-       switch ( $ical_mode )
-       {
-               case 'export':
-                       export_events();
-                       break;
-
-               case 'alarms':
-                       list_alarms();
-                       break;
-
-               case 'freebusy':
-               default:
-                       //do nothing for now!
-       }
-       
        $start['d'] = $start['m'] = $start['y'] = 0;
        if ( $prev <> -1 )
        {
@@ -135,10 +118,30 @@
        }
        else
        {
+               
+               $ical_mode = (isset($_GET['mode']) && strlen($_GET['mode']) ) ? 
$_GET['mode'] : 'freebusy';
+
+               switch ( $ical_mode )
+               {
+                       case 'export':
+                               export_events();
+                               break;
+
+                       case 'alarms':
+                               list_alarms();
+                               break;
+
+                       case 'freebusy':
+                       default:
+                               //do nothing for now!
+               }
+
                $browser = createObject('phpgwapi.browser');
                $browser->content_header($login . '.ics','text/calendar');
+       }
+       @$GLOBALS['phpgw']->session->destroy($sessionid, 
$GLOBALS['phpgw']->session->kp3);
 
-               if(isset($_GET['mode']) && $_GET['mode'] == 'alarm')
+       function list_alarms()
                {
                        if(isset($_GET['time']))
                        {
@@ -162,9 +165,9 @@
         
                        // find the appropriate events that have alarms
                        echo $export->export( array('l_event_id' => $ids, 
'alarms_only' => true, 'minutes' => $minutes) );
-                       
                }
-               else
+
+       function export_events()
                {
                        list($start['d'], $start['m'], $start['y']) = 
explode('-', date('d-n-Y', strtotime("-$prev months")));
                        list($end['d'], $end['m'], $end['y']) = explode('-', 
date('d-n-Y', strtotime("+$adv months")));
@@ -172,6 +175,6 @@
                                
                        echo $export->export( array('l_event_id' => $ids) );
                }
-       }
-       @$GLOBALS['phpgw']->session->destroy($sessionid, 
$GLOBALS['phpgw']->session->kp3);
+
+       
 ?>