$optional_delimiter = "detect" if ( !$optional_delimiter );
$auto_create_special = 'false' if ( !$auto_create_special );
$default_use_priority = 'true' if ( !$default_use_priority );
-$hide_sm_attributions = 'false' if ( !$hide_sm_attributions );
$default_use_mdn = 'true' if ( !$default_use_mdn );
$delete_folder = 'false' if ( !$delete_folder );
$noselect_fix_enable = 'false' if ( !$noselect_fix_enable );
$provider_name = '' if ( !$provider_name );
$edit_identity = 'true' if ( !$edit_identity );
$edit_name = 'true' if ( !$edit_name );
-$allow_thread_sort = 'false' if ( !$allow_thread_sort );
-$allow_server_sort = 'false' if ( !$allow_server_sort );
$no_list_for_subscribe = 'false' if ( !$no_list_for_subscribe );
$allow_charset_search = 'true' if ( !$allow_charset_search );
$allow_advanced_search = 0 if ( !$allow_advanced_search) ;
$skip_SM_header = 'false' if ( !$skip_SM_header );
$default_use_javascript_addr_book = 'false' if (! $default_use_javascript_addr_book);
+# since 1.2.0
+$hide_sm_attributions = 'false' if ( !$hide_sm_attributions );
+
# since 1.4.0
$use_smtp_tls= 'false' if ( !$use_smtp_tls);
$smtp_auth_mech = 'none' if ( !$smtp_auth_mech );
$use_imap_tls = 1 if ( $use_imap_tls eq 'true');
$use_smtp_tls = 0 if ( $use_smtp_tls eq 'false');
$use_smtp_tls = 1 if ( $use_smtp_tls eq 'true');
+# sorting options changed names and reversed values in 1.5.1
+$disable_thread_sort = 'false' if ( !$disable_thread_sort );
+$disable_server_sort = 'false' if ( !$disable_server_sort );
if ( $ARGV[0] eq '--install-plugin' ) {
print "Activating plugin " . $ARGV[1] . "\n";
print "9. Allow editing of identity : $WHT$edit_identity$NRM\n";
print " Allow editing of name : $WHT$edit_name$NRM\n";
print " Remove username from header : $WHT$hide_auth_header$NRM\n";
- print "10. Allow server thread sort : $WHT$allow_thread_sort$NRM\n";
- print "11. Allow server-side sorting : $WHT$allow_server_sort$NRM\n";
+ print "10. Disable server thread sort : $WHT$disable_thread_sort$NRM\n";
+ print "11. Disable server-side sorting : $WHT$disable_server_sort$NRM\n";
print "12. Allow server charset search : $WHT$allow_charset_search$NRM\n";
print "13. Allow advanced search : $WHT$allow_advanced_search$NRM\n";
print "14. PHP session name : $WHT$session_name$NRM\n";
elsif ( $command == 7 ) { $hide_sm_attributions = command38(); }
elsif ( $command == 8 ) { $default_use_mdn = command39(); }
elsif ( $command == 9 ) { $edit_identity = command310(); }
- elsif ( $command == 10 ) { $allow_thread_sort = command312(); }
- elsif ( $command == 11 ) { $allow_server_sort = command313(); }
+ elsif ( $command == 10 ) { $disable_thread_sort = command312(); }
+ elsif ( $command == 11 ) { $disable_server_sort = command313(); }
elsif ( $command == 12 ) { $allow_charset_search = command314(); }
elsif ( $command == 13 ) { $allow_advanced_search = command316(); }
elsif ( $command == 14 ) { $session_name = command317(); }
}
sub command312 {
- print "This option allows you to choose if users can use thread sorting\n";
- print "Your IMAP server must support the THREAD command for this to work\n";
- print "PHP versions later than 4.0.3 recommended\n";
+ print "This option allows you to disable server side thread sorting if your server \n";
+ print "declares THREAD support, but you don't want to provide threading options \n";
+ print "to end users or THREAD extension is broken or extension does not work with \n";
+ print "options used by SquirrelMail. Option is not used, if THREAD extension is \n";
+ print "not declared in IMAP CAPABILITY.\n";
print "\n";
- if ( lc($allow_thread_sort) eq 'true' ) {
+ if ( lc($disable_thread_sort) eq 'true' ) {
$default_value = "y";
} else {
$default_value = "n";
}
- print "Allow server side thread sorting? (y/n) [$WHT$default_value$NRM]: $WHT";
- $allow_thread_sort = <STDIN>;
- if ( ( $allow_thread_sort =~ /^y\n/i ) || ( ( $allow_thread_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
- $allow_thread_sort = 'true';
+ print "Disable server side thread sorting? (y/n) [$WHT$default_value$NRM]: $WHT";
+ $disable_thread_sort = <STDIN>;
+ if ( ( $disable_thread_sort =~ /^y\n/i ) || ( ( $disable_thread_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+ $disable_thread_sort = 'true';
} else {
- $allow_thread_sort = 'false';
+ $disable_thread_sort = 'false';
}
- return $allow_thread_sort;
+ return $disable_thread_sort;
}
sub command313 {
- print "This option allows you to choose if SM uses server-side sorting\n";
- print "Your IMAP server must support the SORT command for this to work\n";
+ print "This option allows you to disable server side sorting if your server declares \n";
+ print "SORT support, but SORT extension is broken or does not work with options \n";
+ print "used by SquirrelMail. Option is not used, if SORT extension is not declared \n";
+ print "in IMAP CAPABILITY.\n";
+ print "\n";
+ print "It is strongly recommended to keep server side sorting enabled, if your ";
+ print "IMAP server supports it.";
print "\n";
- if ( lc($allow_server_sort) eq 'true' ) {
+ if ( lc($disable_server_sort) eq 'true' ) {
$default_value = "y";
} else {
$default_value = "n";
}
- print "Allow server-side sorting? (y/n) [$WHT$default_value$NRM]: $WHT";
- $allow_server_sort = <STDIN>;
- if ( ( $allow_server_sort =~ /^y\n/i ) || ( ( $allow_server_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
- $allow_server_sort = 'true';
+ print "Disable server-side sorting? (y/n) [$WHT$default_value$NRM]: $WHT";
+ $disable_server_sort = <STDIN>;
+ if ( ( $disable_server_sort =~ /^y\n/i ) || ( ( $disable_server_sort =~ /^\n/ ) && ( $default_value eq "y" ) ) ) {
+ $disable_server_sort = 'true';
} else {
- $allow_server_sort = 'false';
+ $disable_server_sort = 'false';
}
- return $allow_server_sort;
+ return $disable_server_sort;
}
sub command314 {
# boolean
print CF "\$hide_auth_header = $hide_auth_header;\n";
# boolean
- print CF "\$allow_thread_sort = $allow_thread_sort;\n";
+ print CF "\$disable_thread_sort = $disable_thread_sort;\n";
# boolean
- print CF "\$allow_server_sort = $allow_server_sort;\n";
+ print CF "\$disable_server_sort = $disable_server_sort;\n";
# boolean
print CF "\$allow_charset_search = $allow_charset_search;\n";
# integer
projects / squirrelmail.git / blobdiff