[Phpgroupware-cvs] phpgwapi/inc class.javascript.inc.php, 1.1.2.4, 1.1.2.5

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.javascript.inc.php 
Log Message:
minor fixes

Index: class.javascript.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.javascript.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.javascript.inc.php    3 Sep 2003 02:25:50 -0000       1.1.2.4
--- class.javascript.inc.php    27 Sep 2003 21:55:59 -0000      1.1.2.5
***************
*** 126,134 ****
                                                        if(!empty($files) && 
is_array($files))
                                                        {
!                                                               foreach($files 
as $file)
                                                                {
                                                                        $links 
.= '<script type="text/javascript" src="'
                                                                        . 
$GLOBALS['phpgw_info']['server']['webserver_url']
!                                                                       . 
"/$app/js/$pkg/$file.js".'">'
                                                                        . 
"</script>\n";
                                                                }
--- 126,134 ----
                                                        if(!empty($files) && 
is_array($files))
                                                        {
!                                                               foreach($files 
as $file => $ignored)
                                                                {
                                                                        $links 
.= '<script type="text/javascript" src="'
                                                                        . 
$GLOBALS['phpgw_info']['server']['webserver_url']
!                                                                       . 
"/$app/js/$pkg/$file" . '.js">'
                                                                        . 
"</script>\n";
                                                                }
***************
*** 193,197 ****
                function validate_file($package, $file, $app='phpgwapi')
                {
!                       if(is_readable(PHPGW_INCLUDE_ROOT . "/$app/js/" . 
$package .'/'. $file . '.js'))
                        {
                                $this->files[$app][$package][$file] = True;
--- 193,197 ----
                function validate_file($package, $file, $app='phpgwapi')
                {
!                       if(is_readable(PHPGW_INCLUDE_ROOT . 
"/$app/js/$package/$file.js"))
                        {
                                $this->files[$app][$package][$file] = True;
***************
*** 200,204 ****
                        elseif($app != 'phpgwapi')
                        {
!                               if(is_readable(PHPGW_INCLUDE_ROOT . 
'/phpgwapi/js/' . $package .'/'. $file . '.js'))
                                {
                                        
$this->files['phpgwapi'][$package][$file] = True;
--- 200,204 ----
                        elseif($app != 'phpgwapi')
                        {
!                               if(is_readable(PHPGW_INCLUDE_ROOT . 
"/phpgwapi/js/$package/$file.js"))
                                {
                                        
$this->files['phpgwapi'][$package][$file] = True;