Changeset 2748 for trunk/phpgwapi

Timestamp:

05/10/10 11:47:10 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo problema no calendario para adicionar evento e na visao diaria.

Location:

trunk/phpgwapi/inc

Files:

• class.javascript.inc.php (modified) (1 diff)
• jscalendar-setup.php (modified) (1 diff)

trunk/phpgwapi/inc/class.javascript.inc.php

@@ -267 +267 @@
                 function get_source( $param )
                 {
+                        ob_start( );
                         $source = '';
                         foreach( explode( ';', $param[ 'source' ] ) as $script )
-                                $source .= file_get_contents( realpath( dirname( __FILE__ ) . '/../..' ) . $script );
+                                if ( strrpos( $script, '.php' ) != strlen( $script ) - 4 )
+                                        $source .= file_get_contents( realpath( dirname( __FILE__ ) . '/../..' ) . $script );
+                                else
+                                {
+                                        include_once realpath( dirname( __FILE__ ) . '/../..' ) . $script;
+                                        $source .= ob_get_contents( );
+                                        ob_clean( );
+                                }
 
                         echo $source;

trunk/phpgwapi/inc/jscalendar-setup.php

@@ -24 +24 @@
 );
 
-include('../../header.inc.php');
+include_once dirname( __FILE__ ) . '/../../header.inc.php';
 header('Content-type: text/javascript; charset='.$GLOBALS['phpgw']->translation->charset());
 $GLOBALS['phpgw']->translation->add_app('jscalendar');