[Phpgroupware-cvs] admin/inc class.uiapplications.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    admin
Changes by:     Dave Hall <skwashd>     06/07/08 13:37:35

Modified files:
        inc            : class.uiapplications.inc.php 

Log message:
        fix header and object references

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiapplications.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14

Patches:
Index: class.uiapplications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiapplications.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.uiapplications.inc.php        20 Feb 2006 13:21:37 -0000      1.13
+++ class.uiapplications.inc.php        8 Jul 2006 13:37:35 -0000       1.14
@@ -9,16 +9,17 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: class.uiapplications.inc.php,v 1.13 2006/02/20 13:21:37 skwashd Exp 
$ */
+  /* $Id: class.uiapplications.inc.php,v 1.14 2006/07/08 13:37:35 skwashd Exp 
$ */
 
        class uiapplications
        {
-               var $public_functions = array(
-                       'get_list' => True,
-                       'add'      => True,
-                       'edit'     => True,
-                       'delete'   => True,
-                       'register_all_hooks' => True
+               var $public_functions = array
+               (
+                       'get_list'      => true,
+                       'add'           => true,
+                       'edit'          => true,
+                       'delete'        => true,
+                       'register_all_hooks' => true
                );
 
                var $bo;
@@ -26,13 +27,15 @@
 
                function uiapplications()
                {
-                       $this->bo = CreateObject('admin.boapplications');
-                       $this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
+                       $this->bo =& CreateObject('admin.boapplications');
+                       $this->nextmatchs =& 
CreateObject('phpgwapi.nextmatchs');
+                       $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
                }
 
                function get_list()
                {
                        $GLOBALS['phpgw']->common->phpgw_header();
+                       echo parse_navbar();
 
                        
$GLOBALS['phpgw']->template->set_file(array('applications' => 
'applications.tpl'));
                        
$GLOBALS['phpgw']->template->set_block('applications','list','list');
@@ -106,8 +109,7 @@
                        
$GLOBALS['phpgw']->template->set_var('lang_note',lang('(To install new 
applications use<br><a href="setup/" target="setup">Setup</a> [Manage 
Applications] !!!)'));
                        
$GLOBALS['phpgw']->template->set_var('lang_add',lang('add'));
 
-                       @reset($applications);
-                       while (list($key,$app) = @each($applications))
+                       foreach ( $applications as $key => $app )
                        {
                                $tr_color = 
$this->nextmatchs->alternate_row_color($tr_color);
 
@@ -205,6 +207,7 @@
                        }
 
                        $GLOBALS['phpgw']->common->phpgw_header();
+                       echo parse_navbar();
 
                        
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Add new application'));
 
@@ -281,6 +284,7 @@
                        }
 
                        $GLOBALS['phpgw']->common->phpgw_header();
+                       echo parse_navbar();
 
                        if ($totalerrors)
                        {
@@ -333,6 +337,7 @@
                        }
 
                        $GLOBALS['phpgw']->common->phpgw_header();
+                       echo parse_navbar();
 
                        
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to 
delete this application ?'));
                        $GLOBALS['phpgw']->template->set_var('no','<a href="' . 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list')
 . '">' . lang('No') . '</a>');
@@ -342,7 +347,7 @@
                
                function register_all_hooks()
                {
-                       if (!is_object($GLOBALS['phpgw']->hooks))
+                       if ( !isset($GLOBALS['phpgw']->hooks) && 
!is_object($GLOBALS['phpgw']->hooks) )
                        {
                                $GLOBALS['phpgw']->hooks = 
CreateObject('phpgwapi.hooks');
                        }