[Phpgroupware-cvs] CVS: setup applications.php,1.21,1.21.2.1

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv10623

Modified Files:
      Tag: Version-0_9_16-branch
        applications.php 
Log Message:
code cleanup

Index: applications.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/applications.php,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -r1.21 -r1.21.2.1
*** applications.php    22 Dec 2002 23:08:09 -0000      1.21
--- applications.php    16 Jul 2003 02:56:28 -0000      1.21.2.1
***************
*** 70,76 ****
        {
                $depstring = '(';
!               while (list($a,$b) = each ($depends))
                {
!                       while (list($c,$d) = each($b))
                        {
                                if (is_array($d))
--- 70,76 ----
        {
                $depstring = '(';
!               foreach($depends as $a => $b)
                {
!                       foreach($b as $c => $d)
                        {
                                if (is_array($d))
***************
*** 127,131 ****
                $upgrade = get_var('upgrade',Array('POST'));
  
!               while (list($appname,$key) = @each($remove))
                {
                        $terror = array();
--- 127,131 ----
                $upgrade = get_var('upgrade',Array('POST'));
  
!               foreach($remove as $appname => $key)
                {
                        $terror = array();
***************
*** 151,155 ****
                }
  
!               while (list($appname,$key) = @each($install))
                {
                        $terror = array();
--- 151,155 ----
                }
  
!               foreach($install as $appname => $key)
                {
                        $terror = array();
***************
*** 190,194 ****
                }
  
!               while (list($appname,$key) = @each($upgrade))
                {
                        $terror = array();
--- 190,194 ----
                }
  
!               foreach($upgrade as $appname => $key)
                {
                        $terror = array();
***************
*** 226,257 ****
        {
                @ksort($setup_info[$detail]);
-               @reset($setup_info[$detail]);
                $setup_tpl->set_var('description',lang('App details') . ':');
                $setup_tpl->pparse('out','header');
-               
-               while (list($key,$val) = each($setup_info[$detail]))
-               {
-                       if ($i) { $i = 0; }
-                       else    { $i = 1; }
- 
-                       //if(!$val) { $val = 'none'; }
  
!                       if ($key == 'tables')
                        {
!                               $tblcnt = count($setup_info[$detail][$key]);
!                               if(is_array($val))
                                {
!                                       $key = '<a 
href="sqltoarray.php?appname=' . $detail . '&submit=True">' . $key . '(' . 
$tblcnt . ')</a>' . "\n";
!                                       $val = implode(',' . "\n",$val);
                                }
                        }
-                       if ($key == 'hooks')   { $val = implode(',',$val); }
-                       if ($key == 'depends') { $val = parsedep($val); }
-                       if (is_array($val))    { $val = implode(',',$val); }
- 
-                       $setup_tpl->set_var('bg_color',$bgcolor[$i]);
-                       $setup_tpl->set_var('name',$key);
-                       $setup_tpl->set_var('details',$val);
-                       $setup_tpl->pparse('out','detail');
                }
  
--- 226,261 ----
        {
                @ksort($setup_info[$detail]);
                $setup_tpl->set_var('description',lang('App details') . ':');
                $setup_tpl->pparse('out','header');
  
!               $setup_tpl->set_var('name','application');
!               $setup_tpl->set_var('details', 
lang($setup_info[$detail]['title']));
!               $setup_tpl->pparse('out','detail');
!       
!               foreach($setup_info[$detail] as $key => $val)
!               {
!                       if($key != 'title')
                        {
!                               $i = ($i ? 0 : 1);
!                       
! 
!                               if ($key == 'tables')
                                {
!                                       $tblcnt = 
count($setup_info[$detail][$key]);
!                                       if(is_array($val))
!                                       {
!                                               $key = '<a 
href="sqltoarray.php?appname=' . $detail . '&submit=True">' . $key . '(' . 
$tblcnt . ')</a>' . "\n";
!                                               $val = implode(',' . "\n",$val);
!                                       }
                                }
+                               if ($key == 'hooks')   { $val = 
implode(',',$val); }
+                               if ($key == 'depends') { $val = parsedep($val); 
}
+                               if (is_array($val))    { $val = 
implode(',',$val); }
+ 
+                               $setup_tpl->set_var('bg_color',$bgcolor[$i]);
+                               $setup_tpl->set_var('name',$key);
+                               $setup_tpl->set_var('details',$val);
+                               $setup_tpl->pparse('out','detail');
                        }
                }
  
***************
*** 302,310 ****
                                        echo lang('because it depends upon') . 
':<br>' . "\n";
                                        list($depapp,$depver) = 
parsedep($setup_info[$resolve]['depends'],False);
!                                       for ($i=0;$i<count($depapp);$i++)
                                        {
                                                echo '<br>' . $depapp[$i] . ': 
';
                                                $list = '';
!                                               while(list($x,$y) = 
@each($depver[$i]))
                                                {
                                                        $list .= $y . ', ';
--- 306,315 ----
                                        echo lang('because it depends upon') . 
':<br>' . "\n";
                                        list($depapp,$depver) = 
parsedep($setup_info[$resolve]['depends'],False);
!                                 $depapp_count = count($depapp);
!                                       for ($i=0; $i<$depapp_count; $i++)
                                        {
                                                echo '<br>' . $depapp[$i] . ': 
';
                                                $list = '';
!                                               foreach($depver[$i] as $x => $y)
                                                {
                                                        $list .= $y . ', ';
***************
*** 372,394 ****
                $setup_tpl->pparse('out','app_header');
  
-               @reset ($setup_info);
                $i = 0;
!               while (list ($key, $value) = each ($setup_info))
                {
                        if(@$value['name'])
                        {
!                               if ($i)
!                               {
!                                       $i = 0;
!                               }
!                               else
!                               {
!                                       $i = 1;
!                               }
                                $setup_tpl->set_var('apptitle',$value['title']);
                                
$setup_tpl->set_var('currentver',@$value['currentver']);
                                
$setup_tpl->set_var('version',$value['version']);
                                $setup_tpl->set_var('bg_color',$bgcolor[$i]);
! 
                                switch($value['status'])
                                {
--- 377,391 ----
                $setup_tpl->pparse('out','app_header');
  
                $i = 0;
!               foreach($setup_info as $key => $value)
                {
                        if(@$value['name'])
                        {
!                               $i = ($i ? 0 : 1); 
                                $setup_tpl->set_var('apptitle',$value['title']);
                                
$setup_tpl->set_var('currentver',@$value['currentver']);
                                
$setup_tpl->set_var('version',$value['version']);
                                $setup_tpl->set_var('bg_color',$bgcolor[$i]);
!                         
                                switch($value['status'])
                                {