Changeset 2604

Timestamp:

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

Author:

rodsouza

Message:

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

Location:

trunk/expressoAdmin1_2

Files:

• inc/class.uiaccounts.inc.php (modified) (5 diffs)
• js/jscode/expressoadmin.js (modified) (2 diffs)
• js/jscode/globals.js (added)
• js/jscode/users.js (modified) (2 diffs)
• templates/default/accounts_form.tpl (modified) (1 diff)

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);");

trunk/expressoAdmin1_2/js/jscode/expressoadmin.js

@@ -10 +10 @@
 
 function load_lang(){
-        cExecute ('$this/inc/load_lang', handler_load_lang);
+        _controller.cache( ).go( {
+                "access" : "$this/inc/load_lang",
+                "handler" : function( data )
+                {
+                        handler_load_lang( expresso.connector.unserialize( data ) );
+                }
+        } );
 }
 
@@ -46 +52 @@
                 }
         }
-        cExecute ('$this.ldap_functions.get_associated_domain&context='+context, handler_associated_domain);    
+        _controller.go( {
+                "access" : "$this.ldap_functions.get_associated_domain&context=" + context,
+                "handler" : function( data )
+                {
+                        handler_associated_domain( expresso.connector.unserialize( data ) );
+                }
+        } );
 }
 

trunk/expressoAdmin1_2/js/jscode/users.js

@@ -276 +276 @@
         }       
                 
-        cExecute ('$this.ldap_functions.get_available_groups&context='+context, handler_get_available_groups);
+        _controller.go( {
+                "access" : "$this.ldap_functions.get_available_groups&context="+context,
+                "handler" : function( data )
+                {
+                        handler_get_available_groups( expresso.connector.unserialize( data ) );
+                }
+        } );
 }
         
@@ -371 +377 @@
                 }
         }
-        cExecute ('$this.ldap_functions.get_available_maillists&context='+context, handler_get_available_maillists);
+        _controller.go( {
+                "access" : "$this.ldap_functions.get_available_maillists&context=" + context,
+                "handler" : function( data )
+                {
+                        handler_get_available_maillists( expresso.connector.unserialize( data ) );
+                }
+        } );
 }
         

trunk/expressoAdmin1_2/templates/default/accounts_form.tpl

@@ -384 +384 @@
 </table>
 
+</form>
+
+</center>
+
 <script type="text/javascript">
 tab.display(1);
 </script>
-
-</form>
-</center>
 <!-- END main -->