From 238d4cfc4a09ec6dc7d059a9f25c2b12fd1c1611 Mon Sep 17 00:00:00 2001 From: kink Date: Wed, 3 Aug 2005 21:32:39 +0000 Subject: [PATCH] Replace PHP4 -> PHP since we also support upcoming PHP versions (at least we wish to support them). git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9901 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- INSTALL | 10 +++++----- README | 4 ++-- UPGRADE | 4 ++-- contrib/RPM/squirrelmail.spec | 4 ++-- help/en_US/FAQ.hlp | 2 +- src/webmail.php | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/INSTALL b/INSTALL index 5a75c96a..11b11d78 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ Installing SquirrelMail Table of Contents: 0. (QUICK!) Quick install guide - 1. (PHP4) Configure your webserver to work with PHP4 + 1. (PHP) Configure your webserver to work with PHP 2. (IMAP) Setting up IMAP (not covered) 3. (INSTALL) Obtaining and installing SquirrelMail 4. (RUN) Running SquirrelMail @@ -17,7 +17,7 @@ Table of Contents: Each of these steps is covered in detail below. -- Install webserver and PHP4 (at least 4.1.0). +- Install webserver and PHP (at least 4.1.0). - Install IMAP server (see docs of that server). - Unpack the SquirrelMail package in a web-accessible location. - Select a data-dir and attachment dir, outside the webtree (e.g. in /var). @@ -33,12 +33,12 @@ Each of these steps is covered in detail below. - Browse to http://www.example.com/yourwebmaillocation/ to log in. -1. CONFIGURE YOUR WEBSERVER TO WORK WITH PHP4 ---------------------------------------------- +1. CONFIGURE YOUR WEBSERVER TO WORK WITH PHP +-------------------------------------------- If your webserver does not already have PHP you must configure it to work with PHP. You need at least PHP v4.1.0. SquirrelMail uses - the standard suffix .php for all PHP4 files. + the standard suffix .php for all PHP files. You can find PHP at http://www.php.net. See the documentation that comes with PHP for instructions how to set it up. diff --git a/README b/README index f64c79b0..d278b46a 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ http://www.squirrelmail.org Introduction: ------------- -SquirrelMail is a standards-based webmail package written in PHP4. It +SquirrelMail is a standards-based webmail package written in PHP. It includes built-in pure PHP support for the IMAP and SMTP protocols, and all pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility across browsers. It has very few requirements and is very easy to configure @@ -17,7 +17,7 @@ Obviously a web interface is ideal for this, given that the user has access to the Internet. After reviewing several open source projects, we realized that we were going to need to do some fairly major customizations to get things to be a nice fit for our needs. So the decision was made to create -our own for some of these reasons, and for fun (we really like PHP4). We +our own for some of these reasons, and for fun (we really like PHP). We decided to open source the project to contribute to the community that has contributed so much to us. Since then, it has grown much bigger than we ever imagined, and we have an awesome development team who are actively diff --git a/UPGRADE b/UPGRADE index ee77526a..f8836939 100644 --- a/UPGRADE +++ b/UPGRADE @@ -7,9 +7,9 @@ using a previous version (0.1 or 0.2), it is suggested that you just start from scratch and configure your settings as if it was your first install. NOTE: The new plugin architecture required the use of some functions which -are not in all versions of PHP4. You will need at least PHP 4.1.0. If you +are not in all versions of PHP. You will need at least PHP 4.1.0. If you need to upgrade please go ahead and install the latest release version of -PHP4. +PHP. 1. Backup old install diff --git a/contrib/RPM/squirrelmail.spec b/contrib/RPM/squirrelmail.spec index 96504ca4..c0697717 100644 --- a/contrib/RPM/squirrelmail.spec +++ b/contrib/RPM/squirrelmail.spec @@ -27,13 +27,13 @@ Group: Applications/Internet Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch -Requires: %{webserver}, php >= 4.0.4, perl, tmpwatch >= 2.8, aspell +Requires: %{webserver}, php >= 4.1.0, perl, tmpwatch >= 2.8, aspell Requires: /usr/sbin/sendmail Prereq: %{webserver}, perl BuildPrereq: perl %description -SquirrelMail is a standards-based webmail package written in PHP4. It +SquirrelMail is a standards-based webmail package written in PHP. It includes built-in pure PHP support for the IMAP and SMTP protocols, and all pages render in pure HTML 4.0 (with no Javascript) for maximum compatibility across browsers. It has very few requirements and is very diff --git a/help/en_US/FAQ.hlp b/help/en_US/FAQ.hlp index 47cc2db2..f7c698d4 100644 --- a/help/en_US/FAQ.hlp +++ b/help/en_US/FAQ.hlp @@ -100,7 +100,7 @@

SquirrelMail uses the IMAP protocol, info on it can be found here. The program also uses - its own IMAP functions, not those built in to PHP4. This won't + its own IMAP functions, not those built in to PHP. This won't matter to anybody except those responsible for installing it, but trust us when we say they appreciate it.

diff --git a/src/webmail.php b/src/webmail.php index aaad5e5f..b380b9dd 100644 --- a/src/webmail.php +++ b/src/webmail.php @@ -90,7 +90,7 @@ $output = "\n". if ($err==2) { echo $output. "\n". - "

You need to have php4 installed with the multibyte string function \n". + "

You need to have PHP installed with the multibyte string function \n". "enabled (using configure option --enable-mbstring).

\n". "

System assumed that you accidently switched to Japanese translation \n". "and reverted your language preference to English.

\n". @@ -183,4 +183,4 @@ echo $output; ?> - \ No newline at end of file + -- 2.25.1