Continued a bit:

- added test for required ext-country (needed by user)
- fixed mask from previous rewrite
- try to set max_execution_time to zero. If this fails and you have it set to e.g. 30 seconds, it is likely that the PHP process aborts with a "time exceeded" message and installation failed

diff --git a/inc/ajax/ajax_installer.php b/inc/ajax/ajax_installer.php
index d697b582946d88b1216bf4231edf1ce2a66622d6..77cc42b8f2cc19c9346c0e87be5e9b03b4699f4d 100644 (file)
--- a/inc/ajax/ajax_installer.php
+++ b/inc/ajax/ajax_installer.php
@@ -666,6 +666,12 @@ function doAjaxInstallerStepInstallExtensions () {
        // Make sure ext-sql_patches is first
        array_unshift($extensions, 'sql_patches');
 
+       // This takes longer
+       if (ini_set('max_input_time', 0) === FALSE) {
+               // Something didn't work
+               logDebugMessage(__FUNCTION__, __LINE__, 'Cannot set max_input_time to 0.');
+       } // END - if
+
        // "Walk" through all extensions
        foreach ($extensions as $key => $ext_name) {
                // Debug message

diff --git a/inc/extensions/user/mode-setup.php b/inc/extensions/user/mode-setup.php
index c1d772ad8111e20c1f51ac09aa00e22a8d208144..d00733f5c65111115b7c3bcf5a5d28dfa5bbc3e5 100644 (file)
--- a/inc/extensions/user/mode-setup.php
+++ b/inc/extensions/user/mode-setup.php
@@ -154,7 +154,8 @@ addAdminMenuSql('user', 'list_refs', 'Referrals anzeigen', 'Mit diesem Menü
 addAdminMenuSql('user', 'list_links', 'Unbestätigte Mails', 'Mit diesem Menüpunkt können Sie die vom Mitglied nicht bestätigten Mails anzeigen.', 8);
 addAdminMenuSql('user', 'list_user_cats', 'Kategorien anzeigen', 'Listet die ausgewählten Kategorien eines Mitgliedes auf.', 9);
 
-// Add dependency to ext-other as pool-user requires it
+// Add dependency to ext-country/ext-other as pool-user/add_tester_user requires it
+addExtensionDependency('country');
 addExtensionDependency('other');
 
 // [EOF]

diff --git a/inc/functions.php b/inc/functions.php
index 07affa858ae621d45ada5a4a95e97f5e0b6732bb..0d6c9889ec38148166358b4b6eb37e57ce176566 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -372,7 +372,7 @@ function generateDereferrerUrl ($url) {
 
                // De-refer this URL
                $url = sprintf(
-                               '{%url=modules.php?module=loader&url=%s&hash=%s&salt=%s%}',
+                               '{%%url=modules.php?module=loader&url=%s&hash=%s&salt=%s%%}',
                                $encodedUrl,
                                encodeHashForCookie($hash),
                                substr($hash, 0, getSaltLength())

diff --git a/inc/modules/admin/what-add_tester_user.php b/inc/modules/admin/what-add_tester_user.php
index f8d3ec44b39204179edfd85fafaa16e6376ad807..588e04a498b5ca068b31c7505d459488e9fefa6e 100644 (file)
--- a/inc/modules/admin/what-add_tester_user.php
+++ b/inc/modules/admin/what-add_tester_user.php
@@ -43,6 +43,13 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
+// Is ext-country installed?
+if (!isExtensionActive('country')) {
+       // This extension is also required
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=country%}');
+       return;
+} // END - if
+
 // Is the form sent or something did go wrong?
 if (!isNewUserTesterAllowed()) {
        // No more accounts allowed to create (maximum reached)