[Phpgroupware-cvs] CVS: comic/inc functions.inc.php,1.17.2.4,1.17.2.5

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/comic/inc
In directory subversions:/tmp/cvs-serv30340/inc

Modified Files:
      Tag: Version-0_9_14-branch
        functions.inc.php 
Log Message:
Patch #819 and some general fixes

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/comic/inc/functions.inc.php,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -C2 -r1.17.2.4 -r1.17.2.5
*** functions.inc.php   4 Mar 2003 22:20:04 -0000       1.17.2.4
--- functions.inc.php   20 Mar 2003 02:37:56 -0000      1.17.2.5
***************
*** 1090,1094 ****
      $appname = $phpgw_info["flags"]["currentapp"];
      
!     $directory = opendir(PHPGW_APP_TPL);
  
      $index=0;
--- 1090,1094 ----
      $appname = $phpgw_info["flags"]["currentapp"];
      
!     $directory = opendir(PHPGW_SERVER_ROOT . SEP. $appname . SEP . 
'templates' . SEP . 'default' . SEP);
  
      $index=0;
***************
*** 1114,1119 ****
      }
  
-     asort($template_name);
- 
      
/**************************************************************************
       * start our template
--- 1114,1117 ----
***************
*** 1126,1176 ****
                cells   => "cell.images.tpl"));
  
!     while (list($value, $name) = each($template_name))
      {
!         $selected = "";
!         if ((int)$value == $app_template)
!         {
!             $selected = "selected";
!         }
! 
!         $image_tpl->set_var(array(OPTION_SELECTED => $selected,
!                                   OPTION_VALUE    => (int)$value,
!                                   OPTION_NAME     => $name));
          
!         $image_tpl->parse(option_list, "options", TRUE);
      }
      $options_c = $image_tpl->get("option_list");
      
!     reset($template_name);
!     $counter = 0;
! 
!     while (list($value, $name) = each($template_name))
      {
!         $index--;
!         
!         $imgname = $name.".gif";
  
!         $filename_f =
!             $phpgw->common->get_image_dir($appname)."/".$imgname;
!         $filename_a =
!             $phpgw->common->get_image_path($appname)."/".$imgname;
  
!         if (file_exists($filename_f))
!         {
!             $counter++;
  
!             $image_tpl->set_var(array(image_number => $name,
                                        image_url    => $filename_a));
!             $image_tpl->parse(image_row, "cells", TRUE);
!         }
          
!         if (($counter == 5) || ($index == 0))
!         {
!             $cells_c = $image_tpl->get("image_row");
              
!             $image_tpl->set_var(image_cells, $cells_c);
!             $image_tpl->parse(IMAGE_ROWS, rows, TRUE);
              
!             $counter = 0;
          }
      }
--- 1124,1181 ----
                cells   => "cell.images.tpl"));
  
!     if(count($template_name))
      {
!        asort($template_name);
!          while (list($value, $name) = each($template_name))
!          {
!              $selected = "";
!              if ((int)$value == $app_template)
!              {
!                  $selected = "selected";
!              }
! 
!              $image_tpl->set_var(array(OPTION_SELECTED => $selected,
!                                        OPTION_VALUE    => (int)$value,
!                                        OPTION_NAME     => $name));
          
!              $image_tpl->parse(option_list, "options", TRUE);
!          }
      }
      $options_c = $image_tpl->get("option_list");
      
!     if(count($template_name))
      {
!        reset($template_name);
!        $counter = 0;
  
!        while (list($value, $name) = each($template_name))
!        {
!            $index--;
!         
!            $imgname = $name.".gif";
  
!            $filename_f =
!                $phpgw->common->get_image_dir($appname)."/".$imgname;
!            $filename_a =
!                $phpgw->common->get_image_path($appname)."/".$imgname;
! 
!            if (file_exists($filename_f))
!            {
!                $counter++;
  
!                $image_tpl->set_var(array(image_number => $name,
                                        image_url    => $filename_a));
!                $image_tpl->parse(image_row, "cells", TRUE);
!            }
          
!            if (($counter == 5) || ($index == 0))
!            {
!                $cells_c = $image_tpl->get("image_row");
              
!                $image_tpl->set_var(image_cells, $cells_c);
!                $image_tpl->parse(IMAGE_ROWS, rows, TRUE);
              
!                $counter = 0;
!            }
          }
      }