From 8b5c49cd37e4dc685dd99221aaa5046220563fd9 Mon Sep 17 00:00:00 2001 From: kink Date: Tue, 15 Mar 2005 20:19:15 +0000 Subject: [PATCH] Add a first rough version of an about box to SquirrelMail. This is linked if $provider_url is set to empty (the new default). It's also linked from the help file. Furthermore by default no version numbers are on the loginpage. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9039 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- config/conf.pl | 10 ++--- config/config_default.php | 6 +-- functions/page_header.php | 9 +++-- help/en_US/basic.hlp | 9 ++--- src/about.php | 83 +++++++++++++++++++++++++++++++++++++++ src/login.php | 4 +- 6 files changed, 102 insertions(+), 19 deletions(-) create mode 100644 src/about.php diff --git a/config/conf.pl b/config/conf.pl index 39ea11b6..693b2edf 100755 --- a/config/conf.pl +++ b/config/conf.pl @@ -349,7 +349,7 @@ if ( $config_use_color == 1 ) { $config_use_color = 2; } -while ( ( $command ne "q" ) && ( $command ne "Q" ) ) { +while ( ( $command ne "q" ) && ( $command ne "Q" ) && ( $command ne ":q" ) ) { clear_screen(); print $WHT. "SquirrelMail Configuration : " . $NRM; if ( $config == 1 ) { print "Read: config.php"; } @@ -774,8 +774,6 @@ sub command1 { print "If your Organization Name includes a '\$', please precede it with a \\. \n"; print "Other '\$' will be considered the beginning of a variable that\n"; print "must be defined before the \$org_name is printed.\n"; - print "\$version, for example, is included by default, and will print the\n"; - print "string representing the current SquirrelMail version.\n"; print "\n"; print "[$WHT$org_name$NRM]: $WHT"; $new_org_name = ; @@ -844,7 +842,7 @@ sub command3 { print "If your Organization Title includes a '\$', please precede it with a \\. \n"; print "Other '\$' will be considered the beginning of a variable that\n"; print "must be defined before the \$org_title is printed.\n"; - print "\$version, for example, is included by default, and will print the\n"; + print "\$version, for example can be used, and will print the\n"; print "string representing the current SquirrelMail version.\n"; print "\n"; print "[$WHT$org_title$NRM]: $WHT"; @@ -896,12 +894,12 @@ sub command6 { # Default link to provider sub command7 { print "Here you can set the link on the right of the page.\n"; - print "The default is 'http://www.squirrelmail.org/'\n"; + print "If empty, it will link to the SquirrelMail About page.\n"; print "\n"; print "[$WHT$provider_uri$NRM]: $WHT"; $new_provider_uri = ; if ( $new_provider_uri eq "\n" ) { - $new_provider_uri = 'http://www.squirrelmail.org/'; + $new_provider_uri = ''; } else { $new_provider_uri =~ s/[\r\n]//g; $new_provider_uri =~ s/^\s+$//g; diff --git a/config/config_default.php b/config/config_default.php index 31796f19..708a2a83 100644 --- a/config/config_default.php +++ b/config/config_default.php @@ -50,7 +50,7 @@ $org_logo_height = '111'; * This is the web page title that appears at the top of the browser window. * @global string $org_title */ -$org_title = "SquirrelMail $version"; +$org_title = "SquirrelMail"; /** * Signout page @@ -90,12 +90,12 @@ $provider_name = 'SquirrelMail'; * Provider URI * * Here you can set URL of the link displayed on the right side of main page. - * + * When empty, this refers to the SquirrelMail About page. * Link will be displayed only if you have $hide_sm_attributions * option set to true. * @global string $provider_uri */ -$provider_uri = 'http://www.squirrelmail.org/'; +$provider_uri = ''; /*** Server Settings ***/ /** diff --git a/functions/page_header.php b/functions/page_header.php index df2ca0d0..8014dd29 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -529,9 +529,12 @@ EOS; if (!$hide_sm_attributions) { echo html_tag( 'td', '', 'right' ) ."\n"; - if (!isset($provider_uri)) $provider_uri= 'http://www.squirrelmail.org/'; - if (!isset($provider_name)) $provider_name= 'SquirrelMail'; - echo ''.$provider_name.''; + if (empty($provider_uri)) { + echo 'SquirrelMail'; + } else { + if (empty($provider_name)) $provider_name= 'SquirrelMail'; + echo ''.$provider_name.''; + } echo "\n"; } echo " \n". diff --git a/help/en_US/basic.hlp b/help/en_US/basic.hlp index ba44e6cb..921e0478 100644 --- a/help/en_US/basic.hlp +++ b/help/en_US/basic.hlp @@ -8,11 +8,10 @@

- So what exactly is SquirrelMail? - It's a web interface to email that's written in PHP4. - It was designed to allow email access through your server from - anywhere in the world via the Web. More information about exactly - how it does this and the IMAP protocol can be found here. + So what exactly is SquirrelMail? + It's a web interface to email: it was designed to allow email access through + your server from anywhere in the world via the Web. For more information about + who made SquirrelMail see the about page.

diff --git a/src/about.php b/src/about.php new file mode 100644 index 00000000..469d7b92 --- /dev/null +++ b/src/about.php @@ -0,0 +1,83 @@ + +

+SquirrelMail Logo
+ + + + +
About SquirrelMail
+
+SquirrelMail is the name of the program that provides access to your email via the web.
+
+If you have questions about or problems with your mailaccount, passwords, abuse etc, +please refer to your system administrator or provider . +They can assist you adequately with these issues. The SquirrelMail development team +cannot help you with that. The help system provides answers +to frequently asked questions.
+
+SquirrelMail is a feature rich, standards compliant webmail application written in PHP. +It was made by a group of volunteers united in the SquirrelMail Development Team and is +released as open source, free software under the GNU General Public License. +For more information about SquirrelMail and the SquirrelMail development team, see +the SquirrelMail website.
+

+System information

+ +You are using SquirrelMail version:
+The administrator installed the following plugins:
+ 0 ) { + sort($plugins); + echo "
    \n"; + foreach($plugins as $plugin) { + echo "
  • " . $plugin . "
    • \n"; + } + echo "
\n\n"; +} else { + echo "none installed\n\n"; +} +?> + +

+
© 1999 - 2005 The SquirrelMail Development Team

+ + + + diff --git a/src/login.php b/src/login.php index e354d906..4f6e8aa1 100644 --- a/src/login.php +++ b/src/login.php @@ -139,7 +139,7 @@ echo html_tag( 'table', ' />
' . "\n" : '' ). ( (isset($hide_sm_attributions) && $hide_sm_attributions) ? '' : - '' . sprintf (_("SquirrelMail version %s"), $version) . '
' ."\n". + '' . _("SquirrelMail Webmail Application") . '
' ."\n". ' ' . _("By the SquirrelMail Development Team") . '
' . "\n" ) . html_tag( 'table', html_tag( 'tr', @@ -186,4 +186,4 @@ echo '' . "\n"; do_hook('login_bottom'); ?> - \ No newline at end of file + -- 2.25.1