Changeset 1890

Timestamp:

12/23/09 11:43:46 (14 years ago)

Author:

eduardoalex

Message:

Ticket #731 - Correcao da visualizacao do textRico - textoSimples

File:

• trunk/expressoMail1_2/inc/hook_settings.inc.php (modified) (2 diffs)

trunk/expressoMail1_2/inc/hook_settings.inc.php

@@ -20 +20 @@
         \**************************************************************************/
 include_once("fckeditor.php");
-$type = $_GET['type']; // FIX ME
+$type = isset($_GET['type']) ? $_GET['type']:$GLOBALS['type']; // FIX ME
 
 //if ($type == 'user' || $type == ''){
@@ -427 +427 @@
 
 function setDefaultTypeSignature() {
-        getTypeSignature().options[0].value = '".$GLOBALS['phpgw']->preferences->default['expressoMail']['type_signature']."d';
-        if(getTypeSignature().value.indexOf('html')!=-1){
-           changeType(getTypeSignature().value);
-    }
+        if(getTypeSignature()){
+                getTypeSignature().options[0].value = '".$GLOBALS['phpgw']->preferences->default['expressoMail']['type_signature']."d';
+                if(getTypeSignature().value.indexOf('html')!=-1){
+                   changeType(getTypeSignature().value);
+            }
+        }else{
+                 changeType('".$GLOBALS['phpgw']->preferences->forced['expressoMail']['type_signature']."');
+        }
 }