Changeset 1663

Timestamp:

11/17/09 16:05:44 (14 years ago)

Author:

niltonneto

Message:

Ticket #731 - Corrigido problema do tipo de assinatura Texto Rico em prefs.

Location:

branches/2.0

Files:

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

branches/2.0/expressoMail1_2/inc/hook_settings.inc.php

@@ -189 +189 @@
 );
 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/';
@@ -369 +370 @@
 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]\" ){
@@ -395 +392 @@
 function setDefaultTypeSignature() {
         getTypeSignature().options[0].value = '".$GLOBALS['phpgw']->preferences->default['expressoMail']['type_signature']."d';
-}
-
-setTimeout('setDefaultTypeSignature();config_form(document.getElementsByName(\'submit\')[0],changeType);changeType(getTypeSignature().value)',2000);
+        if(getTypeSignature().value.indexOf('html')!=-1){
+           changeType(getTypeSignature().value);
+    }
+}
+
+setTimeout('setDefaultTypeSignature();config_form(document.getElementsByName(\'submit\')[0],changeType);',2000);
 </script>");
+}else{
+        create_select_box('Signature Type','type_signature',$default,'','','','');
+
 }
 ?>

branches/2.0/preferences/index.php

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

branches/2.0/preferences/preferences.php

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