[Phpgroupware-cvs] admin/inc/hook_after_navbar.inc.php, 1.7

[nomail]

Update of /admin/inc
Modified Files:
        Branch: 
          hook_after_navbar.inc.php

date: 2004/12/30 07:38:14;  author: skwashd;  state: Exp;  lines: +10 -15

Log Message:
new HEAD admin - sans GIFs
=====================================================================
Index: admin/inc/hook_after_navbar.inc.php
diff -u admin/inc/hook_after_navbar.inc.php:1.6 
admin/inc/hook_after_navbar.inc.php:1.7
--- admin/inc/hook_after_navbar.inc.php:1.6     Tue Jan 20 05:52:13 2004
+++ admin/inc/hook_after_navbar.inc.php Thu Dec 30 07:38:14 2004
@@ -23,7 +23,7 @@
                        $GLOBALS['phpgw_info']['user']['apps']['admin']) ||
                        $GLOBALS['phpgw_info']['server']['checkappversions'] == 
'All')
                {
-                       $_current = array();
+                       $_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__);
                        while($GLOBALS['phpgw']->db->next_record())
@@ -36,34 +36,29 @@
                                        include($_versionfile);
                                        /* echo '<br>' . $_versionfile . ','; */
                                        $_file_version = 
$setup_info[$app_name]['version'];
-                                       $_app_title    = str_replace('- 
','-',ucwords(str_replace('_','- ',$setup_info[$app_name]['name'])));
+                                       $_app_title    = 
$setup_info[$app_name]['title'];
                                        unset($setup_info);
 
-                                       /* echo '<br>' . $app_name . ',' . 
$_db_version . ',' . $_file_version; */
-                                       $test = 
$GLOBALS['phpgw']->common->cmp_version_long($_db_version,$_file_version);
-                                       if($test == '')
+                                       if($app_name == 'phpgwapi')
                                        {
-                                               $_current[$app_name] = True;
-                                               if($app_name == 'phpgwapi')
-                                               {
-                                                       $api_str = '<br>' . 
lang('The API is current');
-                                               }
+                                               $api_str = '<br>' . lang('The 
API requires an upgrade');
                                        }
-                                       else
+                                       /* 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 requires an upgrade');
+                                                       $api_str = '<br>' . 
lang('The API is current');
                                                }
                                        }
-                                       unset($test);
                                        unset($_file_version);
                                        unset($_app_title);
                                }
                                unset($_db_version);
                                unset($_versionfile);
                        }
-                       
if(address@hidden($_current[$GLOBALS['phpgw_info']['flags']['currentapp']]))
+                       if(!$_current)
                        {
                                echo '<center>';
                                echo $api_str;