Changeset 2549 for trunk/expressoAdmin1_2/inc

Timestamp:

04/15/10 15:26:02 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas com a inclusão de javascript.

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.institutional_accounts.inc.php (modified) (1 diff)
• class.uiaccounts.inc.php (modified) (2 diffs)
• class.uigroups.inc.php (modified) (4 diffs)
• class.uishared_accounts.inc.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.institutional_accounts.inc.php

@@ -99 +99 @@
                         $p->set_var($var);
                         $p->pfp('out','body');
-                        echo "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );
+                        $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>";
                 }
 

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -51 +51 @@
                         $GLOBALS['phpgw']->js->validate_file('jscode','tabs','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','users','expressoAdmin1_2');
+                        $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>";
                 }
 
@@ -724 +725 @@
                                 $t->set_var('display_samba_suport', 'none');
                         
-                        echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );
                         echo "<style>{$this -> css( )}</style>";
                         $t->pfp('out','body');                  
-                        echo '<script>get_available_groups(document.forms[0].context.value);get_available_maillists(document.forms[0].context.value);use_samba_attrs("'.$user_info['sambaUser'].'");</script>';
+                        $GLOBALS['phpgw_info']['flags']['java_script'] = '<script>get_available_groups(document.forms[0].context.value);get_available_maillists(document.forms[0].context.value);use_samba_attrs("'.$user_info['sambaUser'].'");</script>';
                 }
                 

trunk/expressoAdmin1_2/inc/class.uigroups.inc.php

@@ -45 +45 @@
                         $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','groups','expressoAdmin1_2');
+                        $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>";
                 }
                 
@@ -162 +163 @@
                                 $p->set_var('input_search',lang('Search') . '&nbsp;<input name="query" value="'.htmlspecialchars(stripslashes($GLOBALS['query'])).'">');
                         }
-                        echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );
                         $p->pfp('out','list');
                 }
@@ -242 +242 @@
                         $p->set_var($this->functions->make_dinamic_lang($p, 'list'));
 
-                        echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );
                         $p->pfp('out','create_group');
                         echo '<script>get_available_users(document.forms[0].org_context.value, document.forms[0].ea_check_allUsers.checked);</script>';
@@ -362 +361 @@
                         $p->set_var($var);
                         $p->set_var($this->functions->make_dinamic_lang($p, 'list'));
-                        echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );
                         $p->pfp('out','create_group');
-                        echo '<script>get_available_users(document.forms[0].org_context.value, document.forms[0].ea_check_allUsers.checked);</script>';
+                        $GLOBALS['phpgw_info']['flags']['java_script'] = '<script>get_available_users(document.forms[0].org_context.value, document.forms[0].ea_check_allUsers.checked);</script>';
                 }
                                 

trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php

@@ -111 +111 @@
                         );
                         $p->set_var($var);
-                        echo "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );
+                        $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>";
                         $p->pfp('out','body');
                 }