diff --git a/check.php-dist b/check.php-dist
index 49004cb03..842dc2372 100644
--- a/check.php-dist
+++ b/check.php-dist
@@ -227,45 +227,21 @@ echo '<br />';
 
 echo '<h3>Checking .ini settings</h3>';
 
-$auto_start   = ini_get('session.auto_start');
-$file_uploads = ini_get('file_uploads');
+$ini_array = array('session.auto_start' => 0, 'file_uploads' => 1,
+    'magic_quotes_sybase' => 0, 'magic_quotes_gpc' => 0);
 
-echo '<h4>session.auto_start = 0</h4>';
-echo 'status: ';
-if ($auto_start == 1) {
-    echo CHECK_NOK;
-} else {
-    echo CHECK_OK;
-}
-echo '<br />';
+foreach ($ini_array AS $var => $val) {
+    $status = ini_get($var);
 
-echo '<h4>file_uploads = On</h4>';
-echo 'status: ';
-if ($file_uploads == 1) {
-    echo CHECK_OK;
-} else {
-    echo CHECK_NOK;
-}
-
-/*
- * Probably not needed because we have a custom handler
-echo '<h4>session.save_path <i>is set</i></h4>';
-echo 'status: ';
-$save_path = ini_get('session.save_path');
-if (empty($save_path)) {
-    echo CHECK_NOK;
-} else {
-    echo CHECK_OK . ": $save_path";
-    if (!file_exists($save_path)) {
-        echo ', but it does not exist';
+    echo "<h4>$var = $val</h4>";
+    echo 'status: ';
+    if ($status != $val) {
+        echo CHECK_NOK;
     } else {
-        if (!is_readable($save_path) || !is_writable($save_path)) {
-            echo ', but permissions to read and/or write are missing';
-        }
+        echo CHECK_OK;
     }
+    echo '<br />';
 }
-echo '<br />';
- */
 
 @include $path . 'config/main.inc.php';
 ?>