From 2ca49e02b411bb59e34534f2308fe023a3b2e34a Mon Sep 17 00:00:00 2001 From: Crizzo Date: Mon, 2 May 2016 22:41:44 +0200 Subject: [PATCH 1/9] [ticket/14620] Start to change install.html to 3.2.0 usage. PHPBB3-14620 --- phpBB/docs/INSTALL.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 62af05c735..e12edd388d 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -59,7 +59,7 @@
  • Quick install
  • Requirements
  • New installation
    • -
  • Updating from stable releases of phpBB 3.1.x +
  • Updating from stable releases of phpBB 3.2.x
    1. Full package
    2. Changed files
      3. @@ -68,8 +68,9 @@
    3. All package types
    • -
  • Updating from phpBB 3.0.x to phpBB 3.1.x
    • -
  • Conversion from phpBB 2.0.x to phpBB 3.1.x +
  • Updating from phpBB 3.0.x to phpBB 3.2.x
    • +
  • Updating from phpBB 3.1.x to phpBB 3.2.x
    • +
  • Conversion from phpBB 2.0.x to phpBB 3.2.x
    1. Requirements before converting
    2. Converting
      3. @@ -109,7 +110,7 @@
    3. Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)
    4. Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):
      store/, cache/, files/ and images/avatars/upload/.
      5. -
    5. Point your web browser to the location where you uploaded the phpBB3 files with the addition of install/index.php or simply install/, e.g. http://www.example.com/phpBB3/install/index.php, http://www.example.com/forum/install/.
      6. +
    6. Point your web browser to the location where you uploaded the phpBB3 files with the addition of install/app.php or simply install/, e.g. http://www.example.com/phpBB3/install/app.php, http://www.example.com/forum/install/.
    7. Click the INSTALL tab, follow the steps and fill out all the requested information.
    8. Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)
    9. phpBB3 should now be available, please MAKE SURE you read at least Section 6 below for important, security related post-installation instructions, and also take note of Section 7 regarding anti-spam measures.
      10. @@ -192,7 +193,7 @@

      phpBB comes supplied with British English as its standard language. However, a number of separate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can, of course, change this default at a later stage). For more details on language packs, where to obtain them and how to install them please see the README.

      -

      Once all the files have been uploaded to your site, you should point your browser at this location with the addition of /install/. For example, if your domain name is www.example.com and you placed the phpBB files in the directory /phpBB3 off your web root you would enter http://www.example.com/phpBB3/install/ or (alternatively) http://www.example.com/phpBB3/install/index.php into your browser. When you have done this, you should see the phpBB Introduction screen appear.

      +

      Once all the files have been uploaded to your site, you should point your browser at this location with the addition of /install/. For example, if your domain name is www.example.com and you placed the phpBB files in the directory /phpBB3 off your web root you would enter http://www.example.com/phpBB3/install/ or (alternatively) http://www.example.com/phpBB3/install/app.php into your browser. When you have done this, you should see the phpBB Introduction screen appear.

      Introduction:

      From 42053efb516b89467ef5fd27d40b73dbc67ad803 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 14 May 2016 15:13:14 +0200 Subject: [PATCH 2/9] [ticket/14620] Readme.html installing phpBB, 2.i, 3.i, 5. and issues PHPBB3-14620 --- phpBB/docs/README.html | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index a7906ac802..cacd42da53 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -91,24 +91,25 @@

      Installation, update and conversion instructions can be found in the INSTALL document in this directory. If you are intending on converting from a phpBB 2.0.x or 3.0.x installation we highly recommend that you backup any existing data before proceeding!

      -

      Users of phpBB 3.0 and 3.1 Beta versions cannot directly update.

      +

      Users of phpBB 3.0, 3.1 and 3.2 Beta versions cannot directly update.

      Please note that we don't support the following installation types:

        -
      • Updates from phpBB 3.0 Beta versions to phpBB 3.0 RC1 and higher
        • +
      • Updates from phpBB 3.0 Beta versions to phpBB 3.1 RC1 and higher
      • Updates from phpBB 3.1 Beta versions to phpBB 3.1 RC1 and higher
        • -
      • Conversions from phpBB 2.0.x to phpBB 3.0 or 3.1 Beta versions
        • -
      • phpBB 3.0 or 3.1 Beta installations
        • +
      • Updates from phpBB 3.2 Beta versions to phpBB 3.2 RC1 and higher
        • +
      • Conversions from phpBB 2.0.x to phpBB 3.0 Beta, 3.1 Beta and 3.2 Beta versions
        • +
      • phpBB 3.0 Beta, 3.1 Beta or 3.2 beta installations

      We give support for the following installation types:

        -
      • Updates from phpBB 3.0 RC1 and 3.1 RC1 to the latest version
        • +
      • Updates from phpBB 3.0 RC1, 3.1 RC1 and 3.2 RC1 to the latest version
      • Note: if using the Automatic Update Package, updates are supported from phpBB 3.0.2 onward. To update a pre-3.0.2 installation, first update to 3.0.2 and then update to the current version.
      • Conversions from phpBB 2.0.x to the latest version
        • -
      • New installations of phpBB 3.0.x - only the latest released version
      • New installations of phpBB 3.1.x - only the latest released version
        • +
      • New installations of phpBB 3.2.x - only the latest released version
      @@ -131,7 +132,7 @@

      2.i. Languages (Internationalisation - i18n)

      -

      A number of language packs with included style localisations are available. You can find them listed in the Language Packs pages of our downloads section or from the Language Packs section of the Customisation Database.

      +

      A number of language packs with included style localisations are available. You can find them listed in the Language Packs pages of our downloads section or from the Language Packs section of the Customisation Database.

      For more information about language packs, please see: https://www.phpbb.com/languages/

      @@ -139,7 +140,7 @@

      Installation of these packages is straightforward: simply download the required language pack, uncompress (unzip) it and via FTP transfer the included language and styles folders to the root of your board installation. The language can then be installed via the Administration Control Panel of your board: Customise tab -> Language management -> Language packs. A more detailed description of the process is in the Knowledge Base article, How to Install a Language Pack.

      -

      If your language is not available, please visit our [3.1.x] Translations forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can Apply to become a translator.

      +

      If your language is not available, please visit our [3.2.x] Translations forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can Apply to become a translator.

      2.ii. Styles

      @@ -185,7 +186,7 @@

      Comprehensive documentation is now available on the phpBB website:

      -

      https://www.phpbb.com/support/docs/en/3.1/ug/

      +

      https://www.phpbb.com/support/docs/en/3.2/ug/

      This covers everything from installation to setting permissions and managing users.

      @@ -274,7 +275,7 @@

      Please be as detailed as you can in your report, and if possible, list the steps required to duplicate the problem. If you have a patch that fixes the issue, please attach it to the ticket or submit a pull request to our repository on GitHub.

      -

      If you create a patch, it is very much appreciated (but not required) if you follow the phpBB coding guidelines. Please note that the coding guidelines are somewhat different between different versions of phpBB. For phpBB 3.1.x the coding guidelines may be found here: http://area51.phpbb.com/docs/31x/coding-guidelines.html

      +

      If you create a patch, it is very much appreciated (but not required) if you follow the phpBB coding guidelines. Please note that the coding guidelines are somewhat different between different versions of phpBB. For phpBB 3.2.x the coding guidelines may be found here: http://area51.phpbb.com/docs/32x/coding-guidelines.html

      Once a bug has been submitted you will be emailed any follow up comments added to it. Please if you are requested to supply additional information, do so! It is frustrating for us to receive bug reports, ask for additional information but get nothing. In these cases we have a policy of closing the bug, which may leave a very real problem in place. Obviously we would rather not have this situation arise.

      @@ -328,7 +329,7 @@

      Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.

      -

      This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and SQLite 3. Versions of PHP used range from 5.4.x to 5.6.x without problem.

      +

      This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQL 3.23, 4.x, 5.x, MariaDB 5.x, MSSQL Server 2000, PostgreSQL 8.x, Oracle 8, SQLite 2 and SQLite 3. Versions of PHP used range from 5.4.x above 5.6.x to 7.0.x without problem.

      7.i. Notice on PHP security issues

      From 96973a7ceca560135227bd029d95c4dc9f303d1d Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 14 May 2016 15:26:05 +0200 Subject: [PATCH 3/9] [ticket/14620] Changes 3.1 to 3.2 links in FAQ.html PHPBB3-14620 --- phpBB/docs/FAQ.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html index 1160e8c131..09ee6c1ddd 100644 --- a/phpBB/docs/FAQ.html +++ b/phpBB/docs/FAQ.html @@ -249,7 +249,7 @@ I want to sue you because i think you host an illegal board!
      -

      Please read the paragraph about permissions in our extensive online documentation.

      +

      Please read the paragraph about permissions in our extensive online documentation.

      @@ -305,7 +305,7 @@ I want to sue you because i think you host an illegal board!
      -

      Please read our extensive user documentation first, it may just explain what you want to know.

      +

      Please read our extensive user documentation first, it may just explain what you want to know.

      Feel free to search our community forum for the information you require. PLEASE DO NOT post your question without having first used search, chances are someone has already asked and answered your question. You can find our board here:

      From 85fdff823025fe7468250417fdcb84bda3072833 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Tue, 24 May 2016 22:43:24 +0200 Subject: [PATCH 4/9] [ticket/14620] Section "Patch file"/"Auto update" was updated in INSTALL.html PHPBB3-14620 --- phpBB/docs/INSTALL.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index e12edd388d..fe508ccbcb 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -293,9 +293,9 @@

      The patch file package is for those wanting to update through the patch application, and should only be used by those who are comfortable with it.

      -

      The patch file is one solution for those with many Modifications (MODs) or other changes and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the Automatic update package explained below. It is also the recommended update method.

      +

      The patch file is one solution for those with changes in to the phpBB core files and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the Automatic update package explained below. It is also the recommended update method.

      -

      A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.1.0, you need the phpBB-3.1.1-patch.zip/tar.bz2 file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

      +

      A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.2.0, you need the phpBB-3.2.1-patch.zip/tar.bz2 file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

      If you do get failures, you should look at using the Changed Files package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

      @@ -305,7 +305,7 @@

      This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.

      -

      The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.1.5, you need the phpBB-3.1.5_to_3.1.6.zip/tar.bz2 file.

      +

      The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.2.0, you need the phpBB-3.2.0_to_3.2.1.zip/tar.bz2 file.

      To perform the update, either follow the instructions from the Administration Control Panel->System Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.

      From 800b7be8730c7416d31a90fd02dc93ce60024c7a Mon Sep 17 00:00:00 2001 From: Crizzo Date: Wed, 8 Jun 2016 20:29:17 +0200 Subject: [PATCH 5/9] [ticket/14620] Updates section 4.i. Full package to 3.2.0 PHPBB3-14620 --- phpBB/docs/INSTALL.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index fe508ccbcb..3b475733d0 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -273,11 +273,11 @@

      The full package is normally meant for new installations only, but if you want to replace all source files, this package comes in handy.

      -

      First, you should make a copy of your existing config.php file; keep it in a safe place! Next, delete all the existing phpBB files, you may want to leave your files/ and images/ directories in place. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see New installation for details if necessary). Once complete, copy back your saved config.php, replacing the new one. Another method is to just replace the existing files with the files from the full package - though make sure you do not overwrite your config.php file.

      +

      First, you should make a copy of your existing config.php file; keep it in a safe place! Next, delete all the existing phpBB files, you may want to leave your files/, images/ and ext/ directories in place, otherwise you will lose your file attachments, uploaded images and get error due to missing extension files. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see New installation for details if necessary). Once complete, copy back your saved config.php, replacing the new one. Another method is to just replace the existing files with the files from the full package - though make sure you do not overwrite your config.php file.

      -

      You should now run install/database_update.php which, depending on your previous version, will make a number of database changes. You may receive FAILURES during this procedure. They should not be a cause for concern unless you see an actual ERROR, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

      +

      You should now got to /install/app.php/update which will display a warning: No valid update directory was found, please make sure you uploaded the relevant files. Beneath that warning you will see a radion button Update database only, just click Submit. Depending on your previous version this will make a number of database changes. You may receive FAILURES during this procedure. They should not be a cause for concern unless you see an actual ERROR, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

      -

      Once install/database_update.php has completed, you may proceed to the Administration Control Panel and then remove the install directory as advised.

      +

      Once /install/app.php/update has completed, it displays the success message: The database update was successful. You may proceed to the Administration Control Panel and then remove the install directory as advised.

      4.ii. Changed files

      From 797565dfa717ed452375dc9601f52d20386dba7a Mon Sep 17 00:00:00 2001 From: Crizzo Date: Wed, 8 Jun 2016 21:45:52 +0200 Subject: [PATCH 6/9] [ticket/14620] Adds2.0 to 3.2. convert; performend convert; still up2date PHPBB3-14620 --- phpBB/docs/INSTALL.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 3b475733d0..5f343c477a 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -368,7 +368,7 @@
      -

      6. Conversion from phpBB 2.0.x to phpBB 3.1.x

      +

      6. Conversion from phpBB 2.0.x to phpBB 3.2.x

      From 25ae8876b653e9fbc762690ad3bf6f79d8ae47e4 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Wed, 8 Jun 2016 22:06:01 +0200 Subject: [PATCH 7/9] [ticket/14620] Adds section update from 3.0/3.1 to 3.2 PHPBB3-14620 --- phpBB/docs/INSTALL.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 5f343c477a..8711b85986 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -68,8 +68,7 @@
    10. All package types
    • -
  • Updating from phpBB 3.0.x to phpBB 3.2.x
    • -
  • Updating from phpBB 3.1.x to phpBB 3.2.x
    • +
  • Updating from phpBB 3.0.x/3.1.x to phpBB 3.2.x
  • Conversion from phpBB 2.0.x to phpBB 3.2.x
    1. Requirements before converting
      2. @@ -334,16 +333,16 @@
      -

      5. Updating from phpBB 3.0.x to phpBB 3.1.x

      +

      5. Updating from phpBB 3.0.x/3.1x to phpBB 3.2.x

      -

      Updating from phpBB 3.0.x to 3.1.x is just the same as updating from stable releases of phpBB 3.1.x

      +

      Updating from phpBB 3.0.x or 3.1.x to 3.2.x is just the same as updating from stable releases of phpBB 3.2.x

      -

      However you can also start with a new set of phpBB 3.1.x files.

      +

      However you can also start with a new set of phpBB 3.2.x files.

      1. Delete all files EXCEPT for the following: @@ -353,10 +352,12 @@
      2. The images/ directory
      3. The files/ directory
      4. The store/ directory
        5. +
      5. (The ext/ directory
        6. -
      6. Upload the contents of the 3.1.x Full Package into your forum's directory. Make sure the root level .htaccess file is included in the upload.
        7. -
      7. Browse to install/database_update.php
        8. +
      8. Upload the contents of the 3.2.x Full Package into your forum's directory. Make sure the root level .htaccess file is included in the upload.
        9. +
      9. Browse to /install/app.php/update
        10. +
      10. Read the notice Update database only and press Submit
      11. Delete the install/ directory
      From 63b902c2f9ac03722a221ab65df80470c75c74c0 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Tue, 21 Jun 2016 20:18:15 +0200 Subject: [PATCH 8/9] [ticket/14620] Changes specific update-support to general: <=beta to >=RC1 PHPBB3-14620 --- phpBB/docs/README.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index cacd42da53..468e7b7bb3 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -95,9 +95,7 @@

      Please note that we don't support the following installation types:

        -
      • Updates from phpBB 3.0 Beta versions to phpBB 3.1 RC1 and higher
        • -
      • Updates from phpBB 3.1 Beta versions to phpBB 3.1 RC1 and higher
        • -
      • Updates from phpBB 3.2 Beta versions to phpBB 3.2 RC1 and higher
        • +
      • Updates from phpBB Beta versions and lower to phpBB Release Candidates and higher
      • Conversions from phpBB 2.0.x to phpBB 3.0 Beta, 3.1 Beta and 3.2 Beta versions
      • phpBB 3.0 Beta, 3.1 Beta or 3.2 beta installations
      From c9cfde78379d48cc183214c448a6468a2295e208 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Thu, 14 Jul 2016 20:23:46 +0200 Subject: [PATCH 9/9] [ticket/14620] Adds link to Translations forum PHPBB3-14620 --- phpBB/docs/README.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 468e7b7bb3..3a4ca02d20 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -138,7 +138,7 @@

      Installation of these packages is straightforward: simply download the required language pack, uncompress (unzip) it and via FTP transfer the included language and styles folders to the root of your board installation. The language can then be installed via the Administration Control Panel of your board: Customise tab -> Language management -> Language packs. A more detailed description of the process is in the Knowledge Base article, How to Install a Language Pack.

      -

      If your language is not available, please visit our [3.2.x] Translations forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can Apply to become a translator.

      +

      If your language is not available, please visit our [3.2.x] Translations forum where you will find topics on translations in progress. Should you wish to volunteer to translate a language not currently available or assist in maintaining an existing language pack, you can Apply to become a translator.

      2.ii. Styles