[Phpgroupware-cvs] CVS: admin/inc hook_after_navbar.inc.php,1.3,1.4

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv20173/admin/inc

Modified Files:
        hook_after_navbar.inc.php 
Log Message:
Fix version check and display



Index: hook_after_navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/hook_after_navbar.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** hook_after_navbar.inc.php   4 Jan 2002 04:43:00 -0000       1.3
--- hook_after_navbar.inc.php   17 Feb 2002 15:34:13 -0000      1.4
***************
*** 24,28 ****
                        $GLOBALS['phpgw_info']['server']['checkappversions'] == 
'All')
                {
!                       $_current = False;
                        $app_name = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $GLOBALS['phpgw']->db->query("SELECT 
app_name,app_version FROM phpgw_applications WHERE app_name='$app_name' OR 
app_name='phpgwapi'",__LINE__,__FILE__);
--- 24,28 ----
                        $GLOBALS['phpgw_info']['server']['checkappversions'] == 
'All')
                {
!                       $_current = array();
                        $app_name = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $GLOBALS['phpgw']->db->query("SELECT 
app_name,app_version FROM phpgw_applications WHERE app_name='$app_name' OR 
app_name='phpgwapi'",__LINE__,__FILE__);
***************
*** 40,56 ****
                                        unset($setup_info);
  
!                                       if($app_name == 'phpgwapi')
                                        {
!                                               $api_str = '<br>' . lang('The 
API requires an upgrade');
                                        }
!                                       /* echo $app_name . ',' . $_db_version 
. ',' . $_file_version; */
!                                       
if(!$GLOBALS['phpgw']->common->cmp_version_long($_db_version,$_file_version))
                                        {
-                                               $_current = True;
                                                if($app_name == 'phpgwapi')
                                                {
!                                                       $api_str = '<br>' . 
lang('The API is current');
                                                }
                                        }
                                        unset($_file_version);
                                        unset($_app_title);
--- 40,61 ----
                                        unset($setup_info);
  
!                                       /* echo '<br>' . $app_name . ',' . 
$_db_version . ',' . $_file_version; */
!                                       $test = 
$GLOBALS['phpgw']->common->cmp_version_long($_db_version,$_file_version);
!                                       if($test == '')
                                        {
!                                               $_current[$app_name] = True;
!                                               if($app_name == 'phpgwapi')
!                                               {
!                                                       $api_str = '<br>' . 
lang('The API is current');
!                                               }
                                        }
!                                       else
                                        {
                                                if($app_name == 'phpgwapi')
                                                {
!                                                       $api_str = '<br>' . 
lang('The API requires an upgrade');
                                                }
                                        }
+                                       unset($test);
                                        unset($_file_version);
                                        unset($_app_title);
***************
*** 59,63 ****
                                unset($_versionfile);
                        }
!                       if(!$_current)
                        {
                                echo '<center>';
--- 64,68 ----
                                unset($_versionfile);
                        }
!                       
if(address@hidden($_current[$GLOBALS['phpgw_info']['flags']['currentapp']]))
                        {
                                echo '<center>';