[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.155,1.156

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv16770

Modified Files:
        class.common.inc.php 
Log Message:
update

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -r1.155 -r1.156
*** class.common.inc.php        27 Sep 2002 02:23:26 -0000      1.155
--- class.common.inc.php        27 Sep 2002 17:39:49 -0000      1.156
***************
*** 1,28 ****
  <?php
!   /**************************************************************************\
!   * phpGroupWare API - Commononly used functions                             *
!   * This file written by Dan Kuykendall <address@hidden>            *
!   * and Joseph Engo <address@hidden>                                 *
!   * and Mark Peters <address@hidden>                               *
!   * Commononly used functions by phpGroupWare developers                     *
!   * Copyright (C) 2000, 2001 Dan Kuykendall                                  *
!   * -------------------------------------------------------------------------*
!   * This library is part of the phpGroupWare API                             *
!   * http://www.phpgroupware.org/api                                          
* 
!   * ------------------------------------------------------------------------ *
!   * This library is free software; you can redistribute it and/or modify it  *
!   * under the terms of the GNU Lesser General Public License as published by *
!   * the Free Software Foundation; either version 2.1 of the License,         *
!   * or any later version.                                                    *
!   * This library is distributed in the hope that it will be useful, but      *
!   * WITHOUT ANY WARRANTY; without even the implied warranty of               *
!   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                     *
!   * See the GNU Lesser General Public License for more details.              *
!   * You should have received a copy of the GNU Lesser General Public License *
!   * along with this library; if not, write to the Free Software Foundation,  *
!   * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA            *
!   \**************************************************************************/
! 
!   /* $Id$ */
  
        $d1 = strtolower(@substr(PHPGW_API_INC,0,3));
--- 1,28 ----
  <?php
!       
/**************************************************************************\
!       * phpGroupWare API - Commononly used functions                          
   *
!       * Written by Dan Kuykendall <address@hidden>                      *
!       * and Joseph Engo <address@hidden>                                 *
!       * and Mark Peters <address@hidden>                               *
!       * and Bettina Gille address@hidden                                 * 
!       * Commononly used functions by phpGroupWare developers                  
   *
!       * Copyright (C) 2000 - 2002 Dan Kuykendall                              
   *
!       * 
------------------------------------------------------------------------ *
!       * This library is part of the phpGroupWare API                          
   *
!       * http://www.phpgroupware.org/api                                       
   * 
!       * 
------------------------------------------------------------------------ *
!       * This library is free software; you can redistribute it and/or modify 
it  *
!       * under the terms of the GNU Lesser General Public License as published 
by *
!       * the Free Software Foundation; either version 2.1 of the License,      
   *
!       * or any later version.                                                 
   *
!       * This library is distributed in the hope that it will be useful, but   
   *
!       * WITHOUT ANY WARRANTY; without even the implied warranty of            
   *
!       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  
   *
!       * See the GNU Lesser General Public License for more details.           
   *
!       * You should have received a copy of the GNU Lesser General Public 
License *
!       * along with this library; if not, write to the Free Software 
Foundation,  *
!       * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA         
   *
!       
\**************************************************************************/
!       /* $Id$ */
  
        $d1 = strtolower(@substr(PHPGW_API_INC,0,3));
***************
*** 633,637 ****
                @abstract list themes available
                */
!               function list_themes()
                {
                        $dh = opendir(PHPGW_SERVER_ROOT . '/phpgwapi/themes');
--- 633,637 ----
                @abstract list themes available
                */
!               /*function list_themes()
                {
                        $dh = opendir(PHPGW_SERVER_ROOT . '/phpgwapi/themes');
***************
*** 646,649 ****
--- 646,666 ----
                        reset ($list);
                        return $list;
+               } */
+ 
+               function list_themes()
+               {
+                       $tpl_dir = $this->get_tpl_dir('phpgwapi');
+ 
+                       $dh = opendir($tpl_dir . SEP . 'css');
+                       while ($file = readdir($dh))
+                       {
+                               if (eregi("\.css$", $file))
+                               {
+                                       $list[] = 
substr($file,0,strpos($file,'.'));
+                               }
+                       }
+                       closedir($dh);
+                       reset ($list);
+                       return $list;
                }
  
***************
*** 1320,1324 ****
                                                . SEP . 'css' . SEP . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css';
                        }
!                       elseif(@file_exists(PHPGW_SERVER_ROOT . SEP . 
'phpgwapi' . SEP . 'templates' . SEP . 'idsociety' . SEP . 'css' . SEP . 
'submarine.css'))
                        {
                                $css_file =  
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 
'templates' . SEP . 'idsociety' . SEP . 'css' . SEP . 'submarine.css';
--- 1337,1341 ----
                                                . SEP . 'css' . SEP . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'] . '.css';
                        }
!                       elseif(@file_exists(PHPGW_SERVER_ROOT . SEP . 
'phpgwapi' . SEP . 'templates' . SEP . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP . 
'css' . SEP . 'submarine.css'))
                        {
                                $css_file =  
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 
'templates' . SEP . 'idsociety' . SEP . 'css' . SEP . 'submarine.css';