X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=install.php;h=d72cf69b07b68dd1429755a73ad6fff4ee2b2d25;hb=261ccfac8699534ff584a2f93d5dcd384529d855;hp=a468d2a6f00a2710c4877156e853225fbb1b7bb2;hpb=cb183359e23ae7a5cfb483fa06c6c4b7a8b05fff;p=quix0rs-gnu-social.git

diff --git a/install.php b/install.php
index a468d2a6f0..d72cf69b07 100644
--- a/install.php
+++ b/install.php
@@ -27,6 +27,7 @@
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Eric Helgeson <helfire@Erics-MBP.local>
  * @author   Evan Prodromou <evan@status.net>
+ * @author   Mikael Nordfeldth <mmn@hethane.se>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@status.net>
  * @author   Tom Adams <tom@holizz.com>
@@ -117,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;
         }
 
@@ -164,10 +165,19 @@ 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']));
             }
         }
 
+        $ssl = array('always'=>null, 'never'=>null);
+        if (!empty($_SERVER['HTTPS'])) {
+            $ssl['always'] = 'checked="checked"';
+        } else {
+            $ssl['never'] = 'checked="checked"';
+        }
+
         echo<<<E_O_T
     <form method="post" action="install.php" class="form_settings" id="form_install">
         <fieldset>
@@ -185,6 +195,12 @@ class WebInstaller extends Installer
                         <input type="radio" name="fancy" id="fancy-disable" value="" /> disable<br />
                         <p class="form_guide" id='fancy-form_guide'>Enable fancy (pretty) URLs. Auto-detection failed, it depends on Javascript.</p>
                     </li>
+                    <li>
+                        <label for="ssl">Server SSL</label>
+                        <input type="radio" name="ssl" id="ssl-always" value="always" {$ssl['always']} /> enable<br />
+                        <input type="radio" name="ssl" id="ssl-never" value="never" {$ssl['never']} /> disable<br />
+                        <p class="form_guide" id="ssl-form_guide">Enabling SSL (https://) requires extra webserver configuration and certificate generation not offered by this installation.</p>
+                    </li>
                 </ul>
             </fieldset>
 
@@ -198,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>
@@ -225,12 +241,12 @@ class WebInstaller extends Installer
                     <li>
                         <label for="admin_nickname">Administrator nickname</label>
                         <input type="text" id="admin_nickname" name="admin_nickname" value="{$post->value('admin_nickname')}" />
-                        <p class="form_guide">Nickname for the initial StatusNet user (administrator)</p>
+                        <p class="form_guide">Nickname for the initial user (administrator)</p>
                     </li>
                     <li>
                         <label for="admin_password">Administrator password</label>
                         <input type="password" id="admin_password" name="admin_password" value="{$post->value('admin_password')}" />
-                        <p class="form_guide">Password for the initial StatusNet user (administrator)</p>
+                        <p class="form_guide">Password for the initial user (administrator)</p>
                     </li>
                     <li>
                         <label for="admin_password2">Confirm password</label>
@@ -239,12 +255,22 @@ class WebInstaller extends Installer
                     <li>
                         <label for="admin_email">Administrator e-mail</label>
                         <input id="admin_email" name="admin_email" value="{$post->value('admin_email')}" />
-                        <p class="form_guide">Optional email address for the initial StatusNet user (administrator)</p>
+                        <p class="form_guide">Optional email address for the initial user (administrator)</p>
                     </li>
+                </ul>
+            </fieldset>
+            <fieldset id="settings_profile">
+                <legend>Site profile</legend>
+                <ul class="form_data">
                     <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>
+                        <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>
+                        </select>
+                        <p class="form_guide">Initial access settings for your site</p>
                     </li>
                 </ul>
             </fieldset>
@@ -284,7 +310,7 @@ STR;
     /**
      * Read and validate input data.
      * May output side effects.
-     * 
+     *
      * @return boolean success
      */
     function prepare()
@@ -302,7 +328,10 @@ 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');
+
+        $this->ssl = $post->string('ssl');
 
         $this->server = $_SERVER['HTTP_HOST'];
         $this->path = substr(dirname($_SERVER['PHP_SELF']), 1);
@@ -315,12 +344,21 @@ STR;
         if (!$this->validateAdmin()) {
             $fail = true;
         }
-        
+
         if ($this->adminPass != $adminPass2) {
             $this->updateStatus("Administrator passwords do not match. Did you mistype?", true);
             $fail = true;
         }
-        
+
+        if (!in_array($this->ssl, array('never', 'sometimes', 'always'))) {
+            $this->updateStatus("Bad value for server SSL enabling.");
+            $fail = true;
+        }
+
+        if (!$this->validateSiteProfile()) {
+            $fail = true;
+        }
+
         return !$fail;
     }
 
@@ -333,36 +371,47 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
     <head>
-        <title>Install StatusNet</title>
-	<link rel="shortcut icon" href="favicon.ico"/>
+        <title>Install GNU social</title>
+        <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"/>
-        <!--[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 IE]><link rel="stylesheet" type="text/css" href="theme/neo/css/ie.css" /><![endif]-->
-        <script src="js/jquery.min.js"></script>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <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="StatusNet"/>
-                        <span class="fn org">StatusNet</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>
             </div>
             <div id="core">
+             <div id="aside_primary_wrapper">
+              <div id="content_wrapper">
+               <div id="site_nav_local_views_wrapper">
+                <div id="site_nav_local_views"></div>
+
                 <div id="content">
                      <div id="content_inner">
-                        <h1>Install StatusNet</h1>
-<?php 
+                        <h1>Install GNU social</h1>
+<?php
 $installer = new WebInstaller();
 $installer->main();
 ?>
                    </div>
                 </div>
+
+                <div id="aside_primary" class="aside"></div>
+               </div>
+              </div>
+             </div>
             </div>
+            <div id="footer"></div>
         </div>
     </body>
 </html>