X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=install.php;h=352d5a143c80ed436a532d6553faec788887e589;hb=33e2f5b449d477e55bda7029f9e826d889e41eb5;hp=190941c5abf6b33f11baf7f9329a158bf56cd61b;hpb=12588b1cf73fad7d0a76a29a46ec355150eaa54e;p=quix0rs-gnu-social.git

diff --git a/install.php b/install.php
index 190941c5ab..352d5a143c 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;
         }
 
@@ -168,6 +169,13 @@ class WebInstaller extends Installer
             }
         }
 
+        $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 +193,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>
 
@@ -225,12 +239,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,7 +253,7 @@ 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>
                     <li>
                         <label for="admin_updates">Subscribe to announcements</label>
@@ -321,6 +335,8 @@ STR;
 
         $this->siteProfile = $post->string('site_profile');
 
+        $this->ssl = $post->string('ssl');
+
         $this->server = $_SERVER['HTTP_HOST'];
         $this->path = substr(dirname($_SERVER['PHP_SELF']), 1);
 
@@ -338,6 +354,11 @@ STR;
             $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;
         }
@@ -354,14 +375,15 @@ 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"/>
+        <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 IE]><link rel="stylesheet" type="text/css" href="theme/neo/css/ie.css" /><![endif]-->
-        <script src="js/jquery.min.js"></script>
+        <!--[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">
@@ -369,8 +391,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
             <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>
+                        <img class="logo photo" src="theme/neo/logo.png" alt="GNU social"/>
+                        <span class="fn org">GNU social</span>
                     </a>
                 </address>
                 <div id="site_nav_global_primary"></div>
@@ -383,7 +405,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 
                 <div id="content">
                      <div id="content_inner">
-                        <h1>Install StatusNet</h1>
+                        <h1>Install GNU social</h1>
 <?php
 $installer = new WebInstaller();
 $installer->main();