Follow-up to bugfix #12436: Move Suhosin part to php.ini section in the install tool
authorOliver Hader <oliver.hader@typo3.org>
Wed, 25 Nov 2009 00:04:11 +0000 (00:04 +0000)
committerOliver Hader <oliver.hader@typo3.org>
Wed, 25 Nov 2009 00:04:11 +0000 (00:04 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6519 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/install/mod/class.tx_install.php

index 1f26eb8..e42e190 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-25  Oliver Hader  <oliver@typo3.org>
+
+       * Follow-up to bugfix #12436: Move Suhosin part to php.ini section in the install tool
+
 2009-11-24  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Updated htmlArea RTE manual.
index cb30371..bf9cfc7 100755 (executable)
@@ -1646,6 +1646,26 @@ From sub-directory:
                        ',3);
                }
 
+                               // Suhosin/Hardened PHP:
+               $suhosinDescription = 'Suhosin limits the number of elements that can be submitted in forms to the server. ' .
+                       'This will affect for example the "All configuration" section in the Install Tool or Inline Relational ' .
+                       'Record Editing (IRRE) with many child records.';
+               if (extension_loaded('suhosin')) {
+                       $suhosinSuggestion = 'At least a value of 400 is suggested.';
+
+                       $suhosinRequestMaxVars = ini_get('suhosin.request.max_vars');
+                       $suhosinPostMaxVars = ini_get('suhosin.post.max_vars');
+                       $suhosinRequestMaxVarsType = ($suhosinRequestMaxVars < 400 ? 2 : -1);
+                       $suhosinPostMaxVarsType = ($suhosinPostMaxVars < 400 ? 2 : -1);
+                       $suhosinType = ($suhosinRequestMaxVars < 400 || $suhosinPostMaxVars < 400 ? 2 : -1);
+
+                       $this->message($ext, 'Suhosin/Hardened PHP is loaded', $suhosinDescription, $suhosinType);
+                       $this->message($ext, 'suhosin.request.max_vars: ' . $suhosinRequestMaxVars, $suhosinSuggestion, $suhosinRequestMaxVarsType);
+                       $this->message($ext, 'suhosin.post.max_vars: ' . $suhosinPostMaxVars, $suhosinSuggestion, $suhosinPostMaxVarsType);
+               } else {
+                       $this->message($ext, 'Suhosin/Hardened PHP is not loaded', $suhosinDescription, 0);
+               }
+
                        // Check for stripped PHPdoc comments that are required to evaluate annotations:
                $method = new ReflectionMethod('tx_install', 'check_mail');
                if (strlen($method->getDocComment()) === 0) {
@@ -1658,8 +1678,6 @@ From sub-directory:
                                '<i>--with-eaccelerator-doc-comment-inclusion</i>';
                        $this->message($ext, 'PHPdoc comments are stripped', $description, 2);
                }
-
-
        }
 
        /**
@@ -1856,26 +1874,6 @@ From sub-directory:
                                }
                        }
                }
-
-                       // Suhosin/Hardened PHP:
-               $suhosinDescription = 'Suhosin limits the number of elements that can be submitted in forms to the server. ' .
-                       'This will affect for example the "All configuration" section in the Install Tool or Inline Relational ' .
-                       'Record Editing (IRRE) with many child records.';
-               if (extension_loaded('suhosin')) {
-                       $suhosinSuggestion = 'At least a value of 400 is suggested.';
-
-                       $suhosinRequestMaxVars = ini_get('suhosin.request.max_vars');
-                       $suhosinPostMaxVars = ini_get('suhosin.post.max_vars');
-                       $suhosinRequestMaxVarsType = ($suhosinRequestMaxVars < 400 ? 2 : -1);
-                       $suhosinPostMaxVarsType = ($suhosinPostMaxVars < 400 ? 2 : -1);
-                       $suhosinType = ($suhosinRequestMaxVars < 400 || $suhosinPostMaxVars < 400 ? 2 : -1);
-
-                       $this->message($ext, 'Suhosin/Hardened PHP is loaded', $suhosinDescription, $suhosinType);
-                       $this->message($ext, 'suhosin.request.max_vars: ' . $suhosinRequestMaxVars, $suhosinSuggestion, $suhosinRequestMaxVarsType);
-                       $this->message($ext, 'suhosin.post.max_vars: ' . $suhosinPostMaxVars, $suhosinSuggestion, $suhosinPostMaxVarsType);
-               } else {
-                       $this->message($ext, 'Suhosin/Hardened PHP is not loaded', $suhosinDescription, 0);
-               }
        }
 
        /**