Changeset 2707 for trunk/index.php

Timestamp:

05/04/10 18:58:04 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo problemas no expressoAdmin1_2.

File:

• trunk/index.php (modified) (2 diffs)

trunk/index.php

@@ -90 +90 @@
 
         $GLOBALS[$class] = CreateObject(sprintf('%s.%s',$app,$class));
-        if((is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data)
+        if ( is_object( $GLOBALS[ $class ] ) && ( ( ! property_exists( $class, 'public_functions' ) ) || (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data ) )
         {
-                execmethod($_GET['menuaction']);
+                $menuaction = $_GET[ 'menuaction' ];
+                unset( $_GET[ 'menuaction' ] );
+                echo execmethod( $menuaction, $_GET );
                 unset($app);
                 unset($class);
@@ -137 +139 @@
                 }
 
-                echo '<script>ExpressoLivre.link( "' . $GLOBALS[ 'phpgw' ] -> link( '/home.php' ) . '", true );</script>';
+                echo '<script>ExpressoLivre.link( "' . $GLOBALS[ 'phpgw' ] -> link( '/home.php' ) . '", true );/* ??? */</script>';
                 exit;
         }