[Phpgroupware-cvs] property index.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/09/28 14:04:19

Modified files:
        .              : index.php 

Log message:
        skwashd happy and me not crazy

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

Patches:
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/property/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- index.php   12 Sep 2006 06:46:01 -0000      1.6
+++ index.php   28 Sep 2006 14:04:19 -0000      1.7
@@ -7,7 +7,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
-       * @version $Id: index.php,v 1.6 2006/09/12 06:46:01 sigurdne Exp $
+       * @version $Id: index.php,v 1.7 2006/09/28 14:04:19 sigurdne Exp $
        */
 
        /**
@@ -17,28 +17,21 @@
         * preferences - and then forward the user to this page
         */
 
-       $currentapp='property';
-
-
-       $GLOBALS['phpgw_info']['flags'] = array(
-               'noheader'   => True,
-               'nonavbar'   => True,
-               'currentapp'    => $currentapp
+       $GLOBALS['phpgw_info']['flags'] = array
+       (
+               'noheader'              => true,
+               'nonavbar'              => true,
+               'currentapp'    => 'property'
                );
 
-       include('../header.inc.php');
-
-       
$start_page=$GLOBALS['phpgw_info']['user']['preferences'][$currentapp]['default_start_page'];
+       include_once('../header.inc.php');
 
-       if ($start_page)
+       $start_page = 'location';
+       if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_start_page'])
+               && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_start_page'] 
)
        {
-               $start_page=array('menuaction'=> 
$currentapp.'.ui'.$start_page.'.index');
+               $start_page = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_start_page'];
        }
-       else
-       {
-               
$start_page=array('menuaction'=>$currentapp.'.uilocation.index');
-       }
-
-       $GLOBALS['phpgw']->redirect_link('/index.php',$start_page);
 
+       $GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction' => 
"property.ui{$start_page}.index"));
 ?>