Changeset 2889 for trunk

Timestamp:

06/01/10 10:20:21 (14 years ago)

Author:

rodsouza

Message:

Ticket #1097 - Populando formulário do mailadmin corretamente.

Location:

trunk/emailadmin

Files:

• inc/class.ui.inc.php (modified) (4 diffs)
• templates/default/editprofile.tpl (modified) (1 diff)

trunk/emailadmin/inc/class.ui.inc.php

@@ -133 +133 @@
                                         $GLOBALS['phpgw']->js->validate_file('jscode','editProfile','emailadmin');
                                         //$GLOBALS['phpgw']->js->set_onload('javascript:initAll();');
-                                        echo $GLOBALS['phpgw']->js->get_script_links();
-                                        $GLOBALS['phpgw']->js->unset_script_link('emailadmin','jscode');
+                                        //echo $GLOBALS['phpgw']->js->get_script_links();
+                                        //$GLOBALS['phpgw']->js->unset_script_link('emailadmin','jscode');
                                         break;
                         }
@@ -141 +141 @@
                 }
 
-                function editProfile($_profileID='')
-                {
-                        if($_profileID != '')
-                        {
-                                $profileID = $_profileID;
+                function editProfile( $_profileID = null )
+                {
+                        if ( $_profileID && is_array( $_profileID ) && array_key_exists( 'profileid', $_profileID ) )
+                        {
+                                $profileID = $_profileID[ 'profileid' ];
                         }
                         elseif(is_int(intval($_GET['profileid'])) && !empty($_GET['profileid']))
@@ -164 +164 @@
                         
                         $this->translate();
-                        
+
                         foreach($profileData as $key => $value)
                         {
@@ -221 +221 @@
                                 $this->t->set_var("lang_imap_option_$key",$value['description']);
                         };
-                                                
+
                         $this->t->parse("out","main");
-                        echo "<style>{$this -> css( )}</style>{$this->t->get('out','main')}<script>initAll( );</script>";
+                        $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] .= '<script>initAll( );tab.display( '
+                                . ( ( array_key_exists( 'tabpage', $_GET ) ) ? $_GET[ 'tabpage' ] : 1 )
+                                . ' );</script>';
+                        echo "<style>{$this -> css( )}</style>{$this->t->get('out','main')}";
                 }
                 

trunk/emailadmin/templates/default/editprofile.tpl

@@ -482 +482 @@
                 </td>
                 <td width="10%" align="center" class="td_right">
-                        <a href="javascript:document.mailsettings.submit();">{lang_save}</a>
+                        <a onclick="ExpressoLivre.form( document.mailsettings );">{lang_save}</a>
                 </td>
         </tr>