GET request would send 'search' parameter because it had a name

[quix0rs-gnu-social.git] / install.php
diff --git a/install.php b/install.php

index 07d79cdb3b4a6955b9b127cc380a82f00f0730f3..f9d69262e290090894546c1a0cbed1f1c591d990 100644 (file)
--- a/install.php
+++ b/install.php
@@ -118,7 +118,7 @@ class WebInstaller extends Installer
      function main()
      {
          if (!$this->checkPrereqs()) {
-            $this->showForm();
+            $this->warning(_('Please fix the above stated problems and refresh this page to continue installing.'));
              return;
          }
  
@@ -165,7 +165,9 @@ class WebInstaller extends Installer
                  } else {
                      $checked = '';
                  }
-                $dbRadios .= "<input type=\"radio\" name=\"dbtype\" id=\"dbtype-$type\" value=\"$type\" $checked/> $info[name]<br />\n";
+                $dbRadios .= sprintf('<input type="radio" name="dbtype" id="dbtype-%1$s" value="%1$s" %2$s/>%3$s<br />',
+                                htmlspecialchars($type), $checked,
+                                htmlspecialchars($info['name']));
              }
          }
  
@@ -212,7 +214,7 @@ class WebInstaller extends Installer
                      </li>
                      <li>
                          <label for="dbtype">Type</label>
-                        $dbRadios
+                        {$dbRadios}
                          <p class="form_guide">Database type</p>
                      </li>
                      <li>
@@ -376,9 +378,10 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
      <head>
          <title>Install GNU social</title>
-       <link rel="shortcut icon" href="favicon.ico"/>
+        <link rel="shortcut icon" href="favicon.ico"/>
          <link rel="stylesheet" type="text/css" href="theme/base/css/display.css" media="screen, projection, tv"/>
          <link rel="stylesheet" type="text/css" href="theme/neo/css/display.css" media="screen, projection, tv"/>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
          <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/base/css/ie.css" /><![endif]-->
          <!--[if lte IE 6]><link rel="stylesheet" type="text/css" theme/base/css/ie6.css" /><![endif]-->
          <!--[if lte IE 7]><link rel="stylesheet" type="text/css" theme/base/css/ie7.css" /><![endif]-->