bugfix

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3014 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/options.php b/functions/options.php
index 057cb8c..653dfc0 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -22,7 +22,7 @@ define('SMOPT_TYPE_textarea', 2);
 define('SMOPT_TYPE_INTEGER', 3);
 define('SMOPT_TYPE_FLOAT', 4);
 define('SMOPT_TYPE_BOOLEAN', 5);
 define('SMOPT_TYPE_INTEGER', 3);
 define('SMOPT_TYPE_FLOAT', 4);
 define('SMOPT_TYPE_BOOLEAN', 5);

-define('SMOPT_TYPE_hidden', 6);
+define('SMOPT_TYPE_HIDDEN', 6);

 define('SMOPT_TYPE_COMMENT', 7);
 
 /* Define constants for the options refresh levels. */
 define('SMOPT_TYPE_COMMENT', 7);
 
 /* Define constants for the options refresh levels. */


@@ -97,7 +97,7 @@ class SquirrelOption {
         }
 
         /* Set the default save function. */
         }
 
         /* Set the default save function. */

-        if (($type != SMOPT_TYPE_hidden) && ($type != SMOPT_TYPE_COMMENT)) {
+        if (($type != SMOPT_TYPE_HIDDEN) && ($type != SMOPT_TYPE_COMMENT)) {

             $this->save_function = SMOPT_SAVE_DEFAULT;
         } else {
             $this->save_function = SMOPT_SAVE_NOOP;
             $this->save_function = SMOPT_SAVE_DEFAULT;
         } else {
             $this->save_function = SMOPT_SAVE_NOOP;


@@ -157,7 +157,7 @@ class SquirrelOption {
             case SMOPT_TYPE_BOOLEAN:
                 $result = $this->createWidget_Boolean();
                 break;
             case SMOPT_TYPE_BOOLEAN:
                 $result = $this->createWidget_Boolean();
                 break;

-            case SMOPT_TYPE_hidden:
+            case SMOPT_TYPE_HIDDEN:

                 $result = $this->createWidget_Hidden();
                 break;
             case SMOPT_TYPE_COMMENT:
                 $result = $this->createWidget_Hidden();
                 break;
             case SMOPT_TYPE_COMMENT:


@@ -396,7 +396,7 @@ function print_option_groups($option_groups) {
 
         /* Print each option in this option group. */
         foreach ($next_optgrp['options'] as $option) {
 
         /* Print each option in this option group. */
         foreach ($next_optgrp['options'] as $option) {

-            if ($option->type != SMOPT_TYPE_hidden) {
+            if ($option->type != SMOPT_TYPE_HIDDEN) {

                 echo html_tag( 'tr', "\n".
                            html_tag( 'td', $option->caption . ':', 'right' ,'', 'valign="middle"' ) .
                            html_tag( 'td', $option->createHTMLWidget(), 'left' )
                 echo html_tag( 'tr', "\n".
                            html_tag( 'td', $option->caption . ':', 'right' ,'', 'valign="middle"' ) .
                            html_tag( 'td', $option->createHTMLWidget(), 'left' )


@@ -421,3 +421,4 @@ function OptionSubmit( $name ) {
 }
 
 ?>
 }
 
 ?>

+)

diff --git a/src/compose.php b/src/compose.php
index 5c6a807..129346d 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -632,7 +632,7 @@ function showInputForm ($session) {
     }
     echo html_tag( 'table', '', 'center', '', 'width="100%" cellspacing="0" border="0"' ) . "\n";
     if ($compose_new_win == '1') {
     }
     echo html_tag( 'table', '', 'center', '', 'width="100%" cellspacing="0" border="0"' ) . "\n";
     if ($compose_new_win == '1') {

-        echo html_tag( 'table', 'center', $color[0], 'width="100%" border="0"' ) .
+        echo html_tag( 'table', '', 'center', $color[0], 'width="100%" border="0"' ) .

                         html_tag( 'tr',
                             html_tag( 'td' ) . 
                             html_tag( 'td',
                         html_tag( 'tr',
                             html_tag( 'td' ) . 
                             html_tag( 'td',


@@ -988,3 +988,4 @@ function getReplyCitation($orig_from)
 }
 
 ?>
 }
 
 ?>

+)