X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=install.php;h=716e1c370a30da229eb6afc31d909caabbc29edf;hb=24910f2363b128853a3f610a220dfc66222f6fdc;hp=352d5a143c80ed436a532d6553faec788887e589;hpb=9291225a69c586424fb5a40588c115bf1b78bce1;p=quix0rs-gnu-social.git

diff --git a/install.php b/install.php
index 352d5a143c..716e1c370a 100644
--- a/install.php
+++ b/install.php
@@ -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>
@@ -255,11 +257,6 @@ class WebInstaller extends Installer
                         <input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
                         <p class="form_guide">Optional email address for the initial user (administrator)</p>
                     </li>
-                    <li>
-                        <label for="admin_updates">Subscribe to announcements</label>
-                        <input type="checkbox" id="admin_updates" name="admin_updates" value="true" checked="checked" />
-                        <p class="form_guide">Release and security feed from <a href="http://update.status.net/">update@status.net</a> (recommended)</p>
-                    </li>
                 </ul>
             </fieldset>
             <fieldset id="settings_profile">
@@ -268,10 +265,10 @@ class WebInstaller extends Installer
                     <li>
                         <label for="site_profile">Type of site</label>
                         <select id="site_profile" name="site_profile">
-                            <option value="private">Private</option>
                             <option value="community">Community</option>
-                            <option value ="public">Public</option>
-                            <option value ="singleuser">Single User</option>
+                            <option value="public">Public (open registration)</option>
+                            <option value="singleuser">Single User</option>
+                            <option value="private">Private (no federation)</option>
                         </select>
                         <p class="form_guide">Initial access settings for your site</p>
                     </li>
@@ -331,7 +328,6 @@ STR;
         $this->adminPass    = $post->string('admin_password');
         $adminPass2         = $post->string('admin_password2');
         $this->adminEmail   = $post->string('admin_email');
-        $this->adminUpdates = $post->string('admin_updates');
 
         $this->siteProfile = $post->string('site_profile');
 
@@ -354,7 +350,7 @@ STR;
             $fail = true;
         }
 
-        if (!in_array($this->ssl, array('never', 'sometimes', 'always'))) {
+        if (!in_array($this->ssl, array('never', 'always'))) {
             $this->updateStatus("Bad value for server SSL enabling.");
             $fail = true;
         }
@@ -380,19 +376,16 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
         <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]-->
         <script src="js/extlib/jquery.js"></script>
         <script src="js/install.js"></script>
     </head>
     <body id="install">
         <div id="wrap">
             <div id="header">
-                <address id="site_contact" class="vcard">
-                    <a class="url home bookmark" href=".">
-                        <img class="logo photo" src="theme/neo/logo.png" alt="GNU social"/>
-                        <span class="fn org">GNU social</span>
+                <address id="site_contact" class="h-card">
+                    <a class="u-url p-name home bookmark org" href=".">
+                        <img class="logo u-photo" src="theme/neo/logo.png" alt="GNU social"/>
+                        GNU social
                     </a>
                 </address>
                 <div id="site_nav_global_primary"></div>