$sub =~ s/\]\[['"]NAME['"]\]//;
$sub =~ s/.*\[//;
$theme_name[$sub] = $options[1];
- } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) {
+ } elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]ID['"]\]/ ) {
$sub = $options[0];
- $sub =~ s/\]\[['"]PATH['"]\]//;
+ $sub =~ s/\]\[['"]ID['"]\]//;
$sub =~ s/.*\[//;
if ( -e "../templates" ) {
$options[1] =~ s/^\.\.\/config/\.\.\/templates/;
}
- $templateset_path[$sub] = &change_to_rel_path($options[1]);
+ $templateset_id[$sub] = $options[1];
+##### FIXME: This section BELOW here so old prefs files don't blow up when running conf.pl
+##### Remove after a month or two
+} elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]PATH['"]\]/ ) {
+ $sub = $options[0];
+ $sub =~ s/\]\[['"]PATH['"]\]//;
+ $sub =~ s/.*\[//;
+ if ( -e "../templates" ) {
+ $options[1] =~ s/^\.\.\/config/\.\.\/templates/;
+ }
+ $templateset_id[$sub] = $options[1];
+##### FIXME: This section ABOVE here so old prefs files don't blow up when running conf.pl
+##### Remove after a month or two
} elsif ( $options[0] =~ /^aTemplateSet\[[0-9]+\]\[['"]NAME['"]\]/ ) {
$sub = $options[0];
$sub =~ s/\]\[['"]NAME['"]\]//;
$ldap_writeable[$sub] = $writeable;
$ldap_search_tree[$sub] = $search_tree;
$ldap_starttls[$sub] = $starttls;
- } elsif ( $options[0] =~ /^(data_dir|attachment_dir|theme_css|org_logo|signout_page)$/ ) {
+ } elsif ( $options[0] =~ /^(data_dir|attachment_dir|org_logo|signout_page|icon_theme_def)$/ ) {
${ $options[0] } = &change_to_rel_path($options[1]);
} else {
${ $options[0] } = $options[1];
$frame_top = "_top" if ( !$frame_top );
$provider_uri = '' if ( !$provider_uri );
$provider_name = '' if ( !$provider_name );
-$edit_identity = 'true' if ( !$edit_identity );
-$edit_name = 'true' if ( !$edit_name );
$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) ;
# since 1.2.0
$hide_sm_attributions = 'false' if ( !$hide_sm_attributions );
+# since 1.2.5
+$edit_identity = 'true' if ( !$edit_identity );
+$edit_name = 'true' if ( !$edit_name );
# since 1.4.0
$use_smtp_tls= 'false' if ( !$use_smtp_tls);
print "2. Server Settings\n";
print "3. Folder Defaults\n";
print "4. General Options\n";
- print "5. Templates\n";
+ print "5. User Interface\n";
print "6. Address Books\n";
print "7. Message of the Day (MOTD)\n";
print "8. Plugins\n";
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 5 ) {
- print $WHT. "Themes\n" . $NRM;
- print "1. Change Template set\n";
-# for ( $count = 0 ; $count <= $#theme_name/2 ; $count++ ) {
-# $temp_name = $theme_name[$count*2];
-# printf " %s%*s %s\n", $temp_name,
-# 40 - length($temp_name), " ",
-# $theme_name[($count*2)+1];
-# }
- print "2. CSS File : $WHT$theme_css$NRM\n";
- print "3. Default font size: $WHT$default_fontsize$NRM\n";
- print "4. Change available font sets\n";
- print "5. Change Themes\n";
+ print $WHT. "User Interface\n" . $NRM;
+ print "1. Modify Template sets\n";
+ print "2. Use Icons : $WHT$use_icons$NRM\n";
+ print "3. Default Icon Set : $WHT$icon_theme_def$NRM\n";
+ print "4. Default font size : $WHT$default_fontsize$NRM\n";
+ print "5. Modify available font sets\n";
+# print "4. Change Themes\n";
print "\n";
print "R Return to Main Menu\n";
} elsif ( $menu == 11 ) {
print $WHT. "Interface tweaks\n" . $NRM;
print "1. Display html mails in iframe : $WHT$use_iframe$NRM\n";
- print "2. Use Icons : $WHT$use_icons$NRM\n";
- print "3. Default Icon Set : $WHT$icon_theme_def$NRM\n";
print "\n";
print $WHT. "PHP tweaks\n" . $NRM;
print "4. Use php recode functions : $WHT$use_php_recode$NRM\n";
elsif ( $command == 16 ) { $config_location_base = command_config_location_base(); }
} elsif ( $menu == 5 ) {
if ( $command == 1 ) { $templateset_default = command_templates(); }
- elsif ( $command == 2 ) { $theme_css = command42(); }
- elsif ( $command == 3 ) { $default_fontsize = command_default_fontsize(); }
- elsif ( $command == 4 ) { command_fontsets(); }
- elsif ( $command == 5 ) { command41(); }
+ elsif ( $command == 2 ) { $use_icons = commandB3(); }
+ elsif ( $command == 3 ) { $icon_theme_def = commandB7(); }
+ elsif ( $command == 4 ) { $default_fontsize = command_default_fontsize(); }
+ elsif ( $command == 5 ) { command_fontsets(); }
} elsif ( $menu == 6 ) {
if ( $command == 1 ) { command61(); }
elsif ( $command == 2 ) { command62(); }
elsif ( $command == 5 ) { $lossy_encoding = commandA5(); }
} elsif ( $menu == 11 ) {
if ( $command == 1 ) { $use_iframe = commandB2(); }
- elsif ( $command == 2 ) { $use_icons = commandB3(); }
- elsif ( $command == 3 ) { $icon_theme_def = commandB7(); }
elsif ( $command == 4 ) { $use_php_recode = commandB4(); }
elsif ( $command == 5 ) { $use_php_iconv = commandB5(); }
elsif ( $command == 6 ) { $allow_remote_configtest = commandB6(); }
}
print " $count. $name";
- print "($templateset_path[$count])\n";
+ print "($templateset_id[$count])\n";
$count++;
}
+# FIXME: what is this stuff? it is commented out, can we just blast it?
# opendir( DIR, "../templates" );
# @files = readdir(DIR);
# $pos = 0;
# if ( -d "../templates/" . $files[$i] && $files[$i] !~ /^\./ && $files[$i] ne "CVS" ) {
# $filename = "../templates/" . $files[$cnt];
# $found = 0;
-# for ( $x = 0 ; $x <= $#templateset_path ; $x++ ) {
+# for ( $x = 0 ; $x <= $#templateset_id ; $x++ ) {
# if ( $theme_path[$x] eq $filename ) {
# $found = 1;
# }
# }
# closedir DIR;
+ $menu_text = ".-------------------------------------.\n"
+ . "| t (detect templates set) |\n"
+ . "| + (add template set) |\n"
+ . "| - N (remove template set) |\n"
+ . "| m N (mark default template set) |\n"
+ . "| l (list template sets) |\n"
+ . "| d (done) |\n"
+ . "|-------------------------------------|\n"
+ . "| where N is a template set number |\n"
+ . "`-------------------------------------'\n";
print "\n";
- print ".--------------------------------.\n";
- print "| t (detect templates set) |\n";
- print "| + (add template set) |\n";
- print "| - N (remove template set) |\n";
- print "| m N (mark template set) |\n";
- print "| l (list template set) |\n";
- print "| d (done) |\n";
- print "`--------------------------------'\n";
+ print $menu_text;
print "\n[template set] command (?=help) > ";
$input = <STDIN>;
$input =~ s/[\r\n]//g;
while ( $input ne "d" ) {
+
+ # list template sets
+ #
if ( $input =~ /^\s*l\s*/i ) {
$count = 0;
while ( $count <= $#templateset_name ) {
}
print " $count. $name";
- print "($templateset_path[$count])\n";
+ print "($templateset_id[$count])\n";
$count++;
}
+
+ # mark default template set
+ #
} elsif ( $input =~ /^\s*m\s*[0-9]+/i ) {
$old_def = $templateset_default;
$templateset_default = $input;
print "Cannot set default template set to $templateset_default. That template set does not exist.\n";
$templateset_default = $old_def;
}
+
+ # add template set
+ #
} elsif ( $input =~ /^\s*\+/ ) {
- print "What is the name of this template: ";
+ print "\nWhat is the name of this template (as shown to your users): ";
$name = <STDIN>;
$name =~ s/[\r\n]//g;
$templateset_name[ $#templateset_name + 1 ] = $name;
- print "Be sure to put ../templates/ before the dirname.\n";
- print "What file is this stored in (ex: ../templates/default/): ";
+ print "\n\nThe directory name should not contain any path information\n"
+ . "or slashes, and should be the name of the directory that the\n"
+ . "template set is found in within the SquirrelMail templates\n"
+ . "directory.\n\n";
+ print "What directory is this stored in (ex: default_advanced): ";
$name = <STDIN>;
$name =~ s/[\r\n]//g;
- $templateset_path[ $#templateset_path + 1 ] = $name;
+ $templateset_id[ $#templateset_id + 1 ] = $name;
+
+ # detect template sets
+ #
} elsif ( $input =~ /^\s*t\s*/i ) {
print "\nStarting detection...\n\n";
opendir( DIR, "../templates" );
@files = readdir(DIR);
$cnt = 0;
- $detected = 0;
while ( $cnt <= $#files ) {
if ( -d "../templates/" . $files[$cnt] && $files[$cnt] !~ /^\./ && $files[$cnt] ne "CVS" ) {
- $filename = "../templates/" . $files[$cnt]. "/";
+ $filename = $files[$cnt];
$found = 0;
- for ( $x = 0 ; $x <= $#templateset_path ; $x++ ) {
- if ( $templateset_path[$x] eq $filename ) {
+ for ( $x = 0 ; $x <= $#templateset_id ; $x++ ) {
+ if ( $templateset_id[$x] eq $filename ) {
$found = 1;
+ last;
}
}
- if ( $found != 1 && $detected == 0) {
- $templateset_path[ $#templateset_path + 1 ] = $filename;
- $templateset_name[ $#templateset_name + 1 ] = "Default template";
- $aTemplateSet[ $#templateset_name + 1 ] = "Default template";
- $aTemplateSet[ $#templateset_path + 1 ] = $filename;
- } elsif ( $found != 1) {
+ if ( $found != 1) {
print "** Found template set: $filename\n";
- print " What is it's name? ";
+ print " What is it's name (as shown to your users)? ";
$nm = <STDIN>;
$nm =~ s/[\n\r]//g;
- $templateset_path[ $#templateset_path + 1 ] = $filename;
+ $templateset_id[ $#templateset_id + 1 ] = $filename;
$templateset_name[ $#templateset_name + 1 ] = $nm;
-
- $aTemplateSet[ $#templateset_name + 1 ] = $nm;
- $aTemplateSet[ $#templateset_path + 1 ] = $filename;
+# FIXME: why are these two lines here?
+# $aTemplateSet[ $#templateset_name + 1 ] = $nm;
+# $aTemplateSet[ $#templateset_id + 1 ] = $filename;
}
- $detected++;
}
$cnt++;
}
print "\n";
- for ( $cnt = 0 ; $cnt <= $#templateset_path ; $cnt++ ) {
- $filename = $templateset_path[$cnt];
- if ( !(-d $filename) ) {
- print " Removing $filename (file not found)\n";
+ for ( $cnt= 0 ; $cnt <= $#templateset_id ; ) {
+ $filename = $templateset_id[$cnt];
+ if ( !(-d change_to_rel_path('SM_PATH . \'templates/' . $filename)) ) {
+ print " Removing \"$filename\" (template set directory not found)\n";
+ if ( $templateset_default gt $cnt ) { $templateset_default--; }
+ elsif ( $templateset_default eq $cnt ) { $templateset_default = 0; }
$offset = 0;
@new_templateset_name = ();
- @new_templateset_path = ();
- for ( $x = 0 ; $x < $#templateset_path ; $x++ ) {
- if ( $templateset_path[$x] eq $filename ) {
+ @new_templateset_id = ();
+ for ( $x = 0 ; $x < $#templateset_id ; $x++ ) {
+ if ( $templateset_id[$x] eq $filename ) {
$offset = 1;
}
if ( $offset == 1 ) {
$new_templateset_name[$x] = $templateset_name[ $x + 1 ];
- $new_theme_path[$x] = $templateset_path[ $x + 1 ];
+ $new_templateset_id[$x] = $templateset_id[ $x + 1 ];
} else {
$new_templateset_name[$x] = $templateset_name[$x];
- $new_templateset_path[$x] = $templateset_path[$x];
+ $new_templateset_id[$x] = $templateset_id[$x];
}
}
@templateset_name = @new_templateset_name;
- @templateset_path = @new_templateset_path;
- }
+ @templateset_id = @new_templateset_id;
+ } else { $cnt++; }
}
print "\nDetection complete!\n\n";
closedir DIR;
- } elsif ( $input =~ /^\s*-\s*[0-9]?/ ) {
+
+ # remove template set
+ #
+ # undocumented functionality of removing last template set isn't that great
+ #} elsif ( $input =~ /^\s*-\s*[0-9]?/ ) {
+ } elsif ( $input =~ /^\s*-\s*[0-9]+/ ) {
if ( $input =~ /[0-9]+\s*$/ ) {
$rem_num = $input;
$rem_num =~ s/^\s*-\s*//g;
} else {
$count = 0;
@new_templateset_name = ();
- @new_templateset_path = ();
+ @new_templateset_id = ();
while ( $count <= $#templateset_name ) {
if ( $count != $rem_num ) {
@new_templateset_name = ( @new_templateset_name, $templateset_name[$count] );
- @new_templateset_path = ( @new_templateset_path, $templateset_path[$count] );
+ @new_templateset_id = ( @new_templateset_id, $templateset_id[$count] );
}
$count++;
}
@templateset_name = @new_templateset_name;
- @templateset_path = @new_templateset_path;
+ @templateset_id = @new_templateset_id;
if ( $templateset_default > $rem_num ) {
$templateset_default--;
}
}
+
+ # help
+ #
} elsif ( $input =~ /^\s*\?\s*/ ) {
- print ".--------------------------------.\n";
- print "| t (detect templates set) |\n";
- print "| + (add template set) |\n";
- print "| - N (remove template set) |\n";
- print "| m N (mark template set) |\n";
- print "| l (list template set) |\n";
- print "| d (done) |\n";
- print "`--------------------------------'\n";
+ print $menu_text;
}
print "[template set] command (?=help) > ";
$input = <STDIN>;
}
-# Theme - CSS file
-sub command42 {
- print "You may specify a cascading style-sheet (CSS) file to be included\n";
- print "on each html page generated by SquirrelMail. The CSS file is useful\n";
- print "for specifying a site-wide font. If you're not familiar with CSS\n";
- print "files, leave this blank.\n";
- print "\n";
- print "To clear out an existing value, just type a space for the input.\n";
- print "\n";
- print "Please be aware of the following: \n";
- print " - Relative URLs are relative to the config dir\n";
- print " to use the themes directory, use ../themes/css/newdefault.css\n";
- print " - To specify a css file defined outside the SquirrelMail source tree\n";
- print " use the absolute URL the webserver would use to include the file\n";
- print " e.g. http://some.host.com/css/mystyle.css or /css/mystyle.css\n";
- print "\n";
- print "[$WHT$theme_css$NRM]: $WHT";
- $new_theme_css = <STDIN>;
-
- if ( $new_theme_css eq "\n" ) {
- $new_theme_css = $theme_css;
- } else {
- $new_theme_css =~ s/[\r\n]//g;
- }
- $new_theme_css =~ s/^\s*//;
- return $new_theme_css;
-}
-
# sets default font size option
sub command_default_fontsize {
print "Enter default font size [$WHT$$default_fontsize$NRM]: $WHT";
$sub = $#ldap_host + 1;
print "First, we need to have the hostname or the IP address where\n";
- print "this LDAP server resides. Example: ldap.bigfoot.com\n";
+ print "this LDAP server resides. Example: ldap.bigfoot.com\n";
+ print "\n";
+ print "You can use any URI compatible with your LDAP library. Please\n";
+ print "note that StartTLS option is not compatible with ldaps and\n";
+ print "ldapi URIs.\n";
print "hostname: ";
$name = <STDIN>;
$name =~ s/[\r\n]//g;
print CF "\n";
# strings
- print CF "\$theme_css = " . &change_to_SM_path($theme_css) . ";\n";
if ( $theme_default eq '' ) { $theme_default = '0'; }
print CF "\$theme_default = $theme_default;\n";
if ( $templateset_default eq '' ) { $templateset_default = '0'; }
print CF "\$templateset_default = $templateset_default;\n";
+# FIXME: need to make this a setting the user can change herein
+# This REALLY needs to be done, since the index of the "default"
+# set cannot always be predicted!
+# Heck, why are default and fallback indexes? If we make them
+# into the ID strings, then it would not cause such issues
+$templateset_fallback = 0;
+ print CF "\$templateset_fallback = $templateset_fallback;\n";
for ( $count = 0 ; $count <= $#templateset_name ; $count++ ) {
- print CF "\$aTemplateSet[$count]['PATH'] = " . &change_to_SM_path($templateset_path[$count]) . ";\n";
+ print CF "\$aTemplateSet[$count]['ID'] = '" . $templateset_id[$count] . "';\n";
# escape theme name so it can contain single quotes.
$esc_name = $templateset_name[$count];
$esc_name =~ s/\\/\\\\/g;
my $new_path = $old_path;
if ( $old_path =~ /^SM_PATH/ ) {
+ # FIXME: the following replacement loses the opening quote mark!
$new_path =~ s/^SM_PATH . \'/\.\.\//;
$new_path =~ s/\.\.\/config\///;
}
projects / squirrelmail.git / blobdiff