[Phpgroupware-cvs] CVS: phpgwapi/inc class.javascript.inc.php, 1.1.2.2, 1.1.2.3

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.javascript.inc.php 
Log Message:
changed arg order to support better defaults

Index: class.javascript.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.javascript.inc.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** class.javascript.inc.php    28 Aug 2003 06:00:37 -0000      1.1.2.2
--- class.javascript.inc.php    28 Aug 2003 06:10:14 -0000      1.1.2.3
***************
*** 186,195 ****
                * Checks to make sure a valid package and file name is provided
                *
-               * @param string $app application directory to search - if not 
found then try phpgwapi
                * @param string $package package to be included
                * @param string $file file to be included - no ".js" on the end
                * @returns bool was the file found?
                */
!               function validate_file($app, $package, $file)
                {
                        if(is_readable(PHPGW_INCLUDE_ROOT . "/$app/js/" . 
$package .'/'. $file . '.js'))
--- 186,195 ----
                * Checks to make sure a valid package and file name is provided
                *
                * @param string $package package to be included
                * @param string $file file to be included - no ".js" on the end
+               * @param string $app application directory to search - default 
= phpgwapi
                * @returns bool was the file found?
                */
!               function validate_file($package, $file, $app='phpgwapi')
                {
                        if(is_readable(PHPGW_INCLUDE_ROOT . "/$app/js/" . 
$package .'/'. $file . '.js'))
***************
*** 198,202 ****
                                return True;
                        }
!                       else
                        {
                                if(is_readable(PHPGW_INCLUDE_ROOT . 
'/phpgwapi/js/' . $package .'/'. $file . '.js'))
--- 198,202 ----
                                return True;
                        }
!                       elseif($app != 'phpgwapi')
                        {
                                if(is_readable(PHPGW_INCLUDE_ROOT . 
'/phpgwapi/js/' . $package .'/'. $file . '.js'))