Changeset 2604 for trunk/expressoAdmin1_2/inc

Timestamp:

04/20/10 11:59:40 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Corrigindo problemas causados por javascripts inseridos dentro de tags.

File:

• trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php (modified) (5 diffs)

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

@@ -47 +47 @@
                                 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
                         }
-                        $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao
+                        $GLOBALS['phpgw']->js->validate_file('jscode','globals','expressoAdmin1_2');
+                        $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','tabs','expressoAdmin1_2');
@@ -231 +232 @@
                 function add_users()
                 {
-                        $GLOBALS['phpgw']->js->validate_file('jscode','users','expressoAdmin1_2');
-                        
-                        $GLOBALS['phpgw']->js->set_onload('get_available_groups(document.forms[0].context.value);');
-                        $GLOBALS['phpgw']->js->set_onload('get_available_maillists(document.forms[0].context.value);');
-                        $GLOBALS['phpgw']->js->set_onload('get_associated_domain(document.forms[0].context.value);');
-                        if ($this->current_config['expressoAdmin_samba_support'] == 'true')
-                                $GLOBALS['phpgw']->js->set_onload('get_available_sambadomains(document.forms[0].context.value, \'create_user\');');
-                        
                         $manager_lid = $GLOBALS['phpgw']->accounts->data['account_lid'];
                         $acl = $this->functions->read_acl($manager_lid);
@@ -257 +250 @@
                         
                         // Seta template
-                        $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+                        //$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
                         $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
                         $t->set_file(array("body" => "accounts_form.tpl"));
@@ -355 +348 @@
                         $t->set_var($this->functions->make_dinamic_lang($t, 'main'));
                         $t->pfp('out','main');
+
+                        $script = '<script>';
+                        $script .= 'get_available_groups(document.forms[0].context.value);';
+                        $script .= 'get_available_maillists(document.forms[0].context.value);';
+                        $script .= 'get_associated_domain(document.forms[0].context.value);';
+                        if ($this->current_config['expressoAdmin_samba_support'] == 'true')
+                                $script .= 'get_available_sambadomains(document.forms[0].context.value, \'create_user\');';
+                        $script .= '</script>';
+
+                        echo $script;
+
                 }
                 
@@ -465 +469 @@
                         }
                         // JavaScript
-                        $GLOBALS['phpgw']->js->validate_file("jscode","users","expressoAdmin1_2");
                         $GLOBALS['phpgw']->js->set_onload("get_available_groups(document.forms[0].context.value);");
                         $GLOBALS['phpgw']->js->set_onload("get_available_maillists(document.forms[0].context.value);");