[Phpgroupware-cvs] phpgwapi/inc class.common.inc.php,1.226

[ceb]

Update of phpgwapi/inc

Modified Files:
     Branch: MAIN
            class.common.inc.php lines: +9 -45

Log Message:
removed supporting old_img_dir plus themes

====================================================
Index: phpgwapi/inc/class.common.inc.php
diff -u phpgwapi/inc/class.common.inc.php:1.225 
phpgwapi/inc/class.common.inc.php:1.226
--- phpgwapi/inc/class.common.inc.php:1.225     Mon Jan 17 14:46:14 2005
+++ phpgwapi/inc/class.common.inc.php   Mon Jan 17 15:23:57 2005
@@ -647,18 +647,7 @@
                        {
                                while ($file = readdir($dh))
                                {
-                                       if (eregi("\.css$", $file) && $file != 
'phpgw.css')
-                                       {
-                                               $list[] = 
substr($file,0,strpos($file,'.'));
-                                       }
-                               }
-                       }
-                       else
-                       {
-                               $dh = opendir(PHPGW_SERVER_ROOT . 
'/phpgwapi/themes');
-                               while ($file = readdir($dh))
-                               {
-                                       if (eregi("\.theme$", $file))
+                                       if (eregi("\.css$",$file) && $file != 
'base.css' && $file != 'login.css')
                                        {
                                                $list[] = 
substr($file,0,strpos($file,'.'));
                                        }
@@ -808,10 +797,8 @@
                                
$GLOBALS['phpgw_info']['server']['template_set'] = 'simple';
                        }

-                       $imagedir            = PHPGW_SERVER_ROOT . '/' . 
$appname . '/templates/'
-                               . 
$GLOBALS['phpgw_info']['server']['template_set'] . '/images';
-                       $imagedir_default    = PHPGW_SERVER_ROOT . '/' . 
$appname . '/templates/base/images';
-                       $imagedir_olddefault = PHPGW_SERVER_ROOT . '/' . 
$appname . '/images';
+                       $imagedir                       = PHPGW_SERVER_ROOT . 
'/' . $appname . '/templates/' . 
$GLOBALS['phpgw_info']['server']['template_set'] . '/images';
+                       $imagedir_default       = PHPGW_SERVER_ROOT . '/' . 
$appname . '/templates/base/images';

                        if ($this->is_image_dir ($imagedir))
                        {
@@ -821,10 +808,6 @@
                        {
                                return $imagedir_default;
                        }
-                       elseif ($this->is_image_dir ($imagedir_olddefault))
-                       {
-                               return $imagedir_olddefault;
-                       }
                        else
                        {
                                return False;
@@ -849,11 +832,10 @@
                                
$GLOBALS['phpgw_info']['server']['template_set'] = 'simple';
                        }

-                       $imagedir            = PHPGW_SERVER_ROOT . 
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
-                       $imagedir_default    = PHPGW_SERVER_ROOT . 
'/'.$appname.'/templates/base/images';
-                       $imagedir_olddefault = PHPGW_SERVER_ROOT . 
'/'.$appname.'/images';
+                       $imagedir                       = PHPGW_SERVER_ROOT . 
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
+                       $imagedir_default       = PHPGW_SERVER_ROOT . 
'/'.$appname.'/templates/base/images';

-                       if ($this->is_image_dir ($imagedir))
+                       if ($this->is_image_dir($imagedir))
                        {
                                return 
$GLOBALS['phpgw_info']['server']['webserver_url'].'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
                        }
@@ -861,10 +843,6 @@
                        {
                                return 
$GLOBALS['phpgw_info']['server']['webserver_url'].'/'.$appname.'/templates/base/images';
                        }
-                       elseif ($this->is_image_dir ($imagedir_olddefault))
-                       {
-                               return 
$GLOBALS['phpgw_info']['server']['webserver_url'].'/'.$appname.'/images';
-                       }
                        else
                        {
                                return False;
@@ -875,22 +853,8 @@
                {
                        if (address@hidden($this->found_files[$appname]))
                        {
-                               $imagedir_olddefault = '/'.$appname.'/images';
-                               $imagedir_default    = 
'/'.$appname.'/templates/base/images';
-                               $imagedir = 
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
-
-                               if 
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault))
-                               {
-                                       $d = 
dir(PHPGW_INCLUDE_ROOT.$imagedir_olddefault);
-                                       while (false != ($entry = $d->read()))
-                                       {
-                                               if ($entry != '.' && $entry != 
'..')
-                                               {
-                                                       
$this->found_files[$appname][$entry] = $imagedir_olddefault;
-                                               }
-                                       }
-                                       $d->close();
-                               }
+                               $imagedir_default       = 
'/'.$appname.'/templates/base/images';
+                               $imagedir                       = 
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';

                                if 
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
                                {