Fixes #2521 - added check for old .htaccess

git-svn-id: http://code.elgg.org/elgg/trunk@7064 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/install/ElggRewriteTester.php b/install/ElggRewriteTester.php
index 7f35010591336a5386b9da2f2c8c3a5624abbff6..6a4d5d16d8c88179095092b9d72e7be3cd7e02a2 100644 (file)
--- a/install/ElggRewriteTester.php
+++ b/install/ElggRewriteTester.php
@@ -105,6 +105,11 @@ class ElggRewriteTester {
                                $this->htaccessIssue = 'non_elgg_htaccess';
                                return FALSE;
                        } else {
+                               // check if this is an old Elgg htaccess
+                               if (strpos($data, 'RewriteRule ^rewrite.php$ install.php') == FALSE) {
+                                       $this->htaccessIssue = 'old_elgg_htaccess';
+                                       return FALSE;
+                               }
                                return TRUE;
                        }
                }

diff --git a/install/languages/en.php b/install/languages/en.php
index 455515b61660f1e4a141d3402fdd88574debebe6..a79b8ebe65ddd068079434237c86d6752c67375f 100644 (file)
--- a/install/languages/en.php
+++ b/install/languages/en.php
@@ -138,6 +138,7 @@ If you are ready to proceed, click the Next button.",
        'install:error:rewrite:htaccess:write_permission' => 'Your web server does not have permission to create the .htaccess file in Elgg\'s directory. You need to manually copy htaccess_dist to .htaccess or change the permissions on the directory.',
        'install:error:rewrite:htaccess:read_permission' => 'There is an .htaccess file in Elgg\'s directory, but your web server does not have permission to read it.',
        'install:error:rewrite:htaccess:non_elgg_htaccess' => 'There is an .htaccess file in Elgg\'s directory that was not not created by Elgg. Please remove it.',
+       'install:error:rewrite:htaccess:old_elgg_htaccess' => 'There appears to be an old Elgg .htaccess file in Elgg\'s directory. It does not contain the rewrite rule for testing the web server.',
        'install:error:rewrite:htaccess:cannot_copy' => 'A unknown error occurred while creating the .htaccess file. You need to manually copy htaccess_dist to .htaccess in Elgg\'s directory.',
        'install:error:rewrite:altserver' => 'The rewrite rules test failed. You need to configure your web server with Elgg\'s rewrite rules and try again.',
        'install:error:rewrite:unknown' => 'Oof. We couldn\'t figure out what kind of web server is running on your server and it failed the rewrite rules. We cannot offer any specific advice. Please check the troubleshooting link.',