[Phpgroupware-cvs] calendar/inc hook_home.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    calendar
Changes by:     Dave Hall <skwashd>     06/09/10 01:47:44

Modified files:
        inc            : hook_home.inc.php 

Log message:
        fix bug #17663 and some spring cleaning

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.43&r2=1.44

Patches:
Index: hook_home.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/hook_home.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- hook_home.inc.php   6 Sep 2006 06:27:02 -0000       1.43
+++ hook_home.inc.php   10 Sep 2006 01:47:44 -0000      1.44
@@ -12,20 +12,15 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: hook_home.inc.php,v 1.43 2006/09/06 06:27:02 sigurdne Exp $ */
+  /* $Id: hook_home.inc.php,v 1.44 2006/09/10 01:47:44 skwashd Exp $ */
 
-       $d1 = strtolower(substr(PHPGW_APP_INC,0,3));
-       if($d1 == 'htt' || $d1 == 'ftp' )
-       {
-               echo 'Failed attempt to break in via an old Security Hole!<br 
/>'."\n";
-               $GLOBALS['phpgw']->common->phpgw_exit();
-       }
-       unset($d1);
 
-       if 
(isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents']))
+       if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])
+               && 
$GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents']
 )
        {
                $GLOBALS['phpgw']->translation->add_app('calendar');
-               if(!is_object($GLOBALS['phpgw']->datetime))
+               if ( !isset($GLOBALS['phpgw']->datetime)
+                       || !is_object($GLOBALS['phpgw']->datetime) )
                {
                        $GLOBALS['phpgw']->datetime = 
CreateObject('phpgwapi.datetime');
                }
@@ -35,28 +30,34 @@
                $GLOBALS['g_month'] = substr($GLOBALS['date'],4,2);
                $GLOBALS['g_day'] = substr($GLOBALS['date'],6,2);
                $GLOBALS['owner'] = 
$GLOBALS['phpgw_info']['user']['account_id'];
-               $GLOBALS['css'] = "\n".'<STYLE 
type="text/css">'."\n".'<!--'."\n"
-                       . 
ExecMethod('calendar.uicalendar.css').'-->'."\n".'</style>';
+               $GLOBALS['css'] = "\n<style type=\"text/css\">\n<!--\n"
+                       . "@import 
url('calendar/templates/base/css/base.css')\n-->\n</style>\n";
 
                $page_ = 
explode('.',$GLOBALS['phpgw_info']['user']['preferences']['calendar']['defaultcalendar']);
                $_page = substr($page_[0],0,7); // makes planner from 
planner_{user|category}
-               if ($_page=='index' || ($_page != 'day' && $_page != 'week' && 
$_page != 'month' && $_page != 'year' && $_page != 'planner'))
+               if ( $_page=='index' || ($_page != 'day' && $_page != 'week' && 
$_page != 'month' && $_page != 'year' && $_page != 'planner'))
                {
                        $_page = 'month';
-//                     
$GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar','month');
-//                     $GLOBALS['phpgw']->preferences->save_repository();
+                       $GLOBALS['phpgw']->preferences->read_repository();
+                       
$GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar','month');
+                       $GLOBALS['phpgw']->preferences->save_repository();
                }
 
                
if(address@hidden(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php'))
                {
-                       $_page = 'day';
+                       $_page = 'month';
+                       $GLOBALS['phpgw']->preferences->read_repository();
+                       
$GLOBALS['phpgw']->preferences->add('calendar','defaultcalendar','month');
+                       $GLOBALS['phpgw']->preferences->save_repository();
                }
-               
include(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');
                
-               $title = '<font color="#FFFFFF">'.lang('Calendar').'</font>';
+               
include_once(PHPGW_INCLUDE_ROOT.'/calendar/inc/hook_home_'.$_page.'.inc.php');
                
-               $portalbox = CreateObject('phpgwapi.listbox',
-                       Array(
+               $title = '<h2>'.lang('Calendar').'</h2>';
+               
+               //TODO Make listbox css compliant
+               $portalbox = CreateObject('phpgwapi.listbox', array
+               (
                                'title' => $title,
                                'primary'       => 
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
                                'secondary'     => 
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
@@ -64,12 +65,12 @@
                                'width' => '100%',
                                'outerborderwidth'      => '0',
                                'header_background_image'       => 
$GLOBALS['phpgw']->common->image('phpgwapi','bg_filler', '.png', False)
-                       )
-               );
+               ));
 
                $app_id = $GLOBALS['phpgw']->applications->name2id('calendar');
                $GLOBALS['portal_order'][] = $app_id;
-               $var = Array(
+               $var = array
+               (
                        'up'    => Array('url'  => '/set_box.php', 'app'        
=> $app_id),
                        'down'  => Array('url'  => '/set_box.php', 'app'        
=> $app_id),
                        'close' => Array('url'  => '/set_box.php', 'app'        
=> $app_id),
@@ -77,12 +78,12 @@
                        'edit'  => Array('url'  => '/set_box.php', 'app'        
=> $app_id)
                );
 
-               while(list($key,$value) = each($var))
+               foreach ( $var as $key => $value )
                {
                        $portalbox->set_controls($key,$value);
                }
 
-               $portalbox->data = Array();
+               $portalbox->data = array();
 
                echo "\n".'<!-- BEGIN Calendar info 
-->'."\n".$portalbox->draw($GLOBALS['extra_data'])."\n".'<!-- END Calendar info 
-->'."\n";
                unset($cal);