Changeset 1873 for trunk

Timestamp:

12/17/09 15:32:26 (14 years ago)

Author:

wmerlotto

Message:

Ticket #731 - Revertendo a revisão [1611], conforme bug encontrado.

Location:

trunk

Files:

• expressoMail1_2/inc/hook_settings.inc.php (modified) (3 diffs)
• preferences/index.php (modified) (1 diff)
• preferences/preferences.php (modified) (1 diff)

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -222 +222 @@
 );
 create_check_box('Insert signature automatically in new messages?','use_signature','');
+create_select_box('Signature Type','type_signature',$default,'','','','onchange="javascript:changeType(this.value);" onload="javascript:alert(this.value);"');
 
 if ($type == 'user' || $type == ''){
-        create_select_box('Signature Type','type_signature',$default,'','','','onchange="javascript:changeType(this.value);"');
-
         $oFCKeditor = new FCKeditor('html_signature');
         $oFCKeditor->BasePath   = '../expressoMail1_2/js/fckeditor/';
@@ -403 +402 @@
 function getTypeSignature() {
    var elementoSelects  = document.getElementsByTagName('select');
- 
+
+   if ( elementoSelects[18].name == \"user[type_signature]\" ) {
+        return elementoSelects[18];
+   }
+   
    for(i=0;i<elementoSelects.length;i++){
-                if( elementoSelects[i].name == \"user[type_signature]\" ){
-                         return elementoSelects[i];
-                }
+        if( elementoSelects[i].name == \"user[type_signature]\" ){
+                 return elementoSelects[i];
+        }
     }
     return null;
@@ -432 +435 @@
 setTimeout('setDefaultTypeSignature();config_form(document.getElementsByName(\'submit\')[0],changeType);',2000);
 </script>");
-}else{
-        create_select_box('Signature Type','type_signature',$default,'','','','');
-
 }
 ?>

trunk/preferences/index.php

@@ -53 +53 @@
                 if (! $GLOBALS['HTTP_GET_VARS']['type'])
                 {
-                        $GLOBALS['HTTP_GET_VARS']['type'] = $session_data['type'];
                         $type = $session_data['type'];
                 }

trunk/preferences/preferences.php

@@ -512 +512 @@
 
         $t->set_var('messages',$error);
-        $t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $_GET['appname'].'&type='.$GLOBALS['HTTP_GET_VARS']['type']));
+        $t->set_var('action_url',$GLOBALS['phpgw']->link('/preferences/preferences.php','appname=' . $_GET['appname']));
         $t->set_var('th_bg',  $GLOBALS['phpgw_info']['theme']['th_bg']);
         $t->set_var('th_text',$GLOBALS['phpgw_info']['theme']['th_text']);