X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=install.php;h=b94a9293607e7928659c4da53e09323283d61f5b;hb=205d8afe546b385100103dafc439d0397c36cbf4;hp=32915200b29054f92bb433f06c6b89087448a393;hpb=a325144fa0ba769de1cdb554cac04e0116912b66;p=quix0rs-gnu-social.git

diff --git a/install.php b/install.php
index 32915200b2..b94a929360 100644
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2009, Controlez-Vous, Inc.
+ * Copyright (C) 2009, Control Yourself, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -35,15 +35,17 @@ function main()
 
 function checkPrereqs()
 {
+	$pass = true;
+
     if (file_exists(INSTALLDIR.'/config.php')) {
          ?><p class="error">Config file &quot;config.php&quot; already exists.</p>
          <?php
-        return false;
+        $pass = false;
     }
 
     if (version_compare(PHP_VERSION, '5.0.0', '<')) {
             ?><p class="error">Require PHP version 5 or greater.</p><?php
-		    return false;
+		    $pass = false;
     }
 
     $reqs = array('gd', 'mysql', 'curl',
@@ -53,7 +55,7 @@ function checkPrereqs()
     foreach ($reqs as $req) {
         if (!checkExtension($req)) {
             ?><p class="error">Cannot load required extension: <code><?php echo $req; ?></code></p><?php
-		    return false;
+		    $pass = false;
         }
     }
 
@@ -61,17 +63,17 @@ function checkPrereqs()
          ?><p class="error">Cannot write config file to: <code><?php echo INSTALLDIR; ?></code></p>
 	       <p>On your server, try this command: <code>chmod a+w <?php echo INSTALLDIR; ?></code>
          <?php
-	     return false;
+	     $pass = false;
 	}
 
 	if (!is_writable(INSTALLDIR.'/avatar/')) {
          ?><p class="error">Cannot write avatar directory: <code><?php echo INSTALLDIR; ?>/avatar/</code></p>
 	       <p>On your server, try this command: <code>chmod a+w <?php echo INSTALLDIR; ?>/avatar/</code></p>
          <?
-	     return false;
+	     $pass = false;
 	}
 
-	return true;
+	return $pass;
 }
 
 function checkExtension($name)
@@ -86,7 +88,6 @@ function checkExtension($name)
 
 function showForm()
 {
-    $config_path = htmlentities(trim(dirname($_SERVER['REQUEST_URI']), '/'));
     echo<<<E_O_T
         </ul>
     </dd>
@@ -119,11 +120,6 @@ function showForm()
                 <input type="text" id="host" name="host" />
                 <p class="form_guide">Database hostname</p>
             </li>
-            <li>
-                <label for="host">Site path</label>
-                <input type="text" id="path" name="path" value="$config_path" />
-                <p class="form_guide">Site path, following the "/" after the domain name in the URL. Empty is fine. Field should be filled automatically.</p>
-            </li>
             <li>
                 <label for="host">Database</label>
                 <input type="text" id="database" name="database" />
@@ -165,7 +161,6 @@ function handlePost()
     $username = $_POST['username'];
     $password = $_POST['password'];
     $sitename = $_POST['sitename'];
-    $path     = $_POST['path'];
     $fancy    = !empty($_POST['fancy']);
 ?>
     <dl class="system_notice">
@@ -173,36 +168,38 @@ function handlePost()
         <dd>
             <ul>
 <?php
+	$fail = false;
+
     if (empty($host)) {
         updateStatus("No hostname specified.", true);
-        showForm();
-        return;
+		$fail = true;
     }
 
     if (empty($database)) {
         updateStatus("No database specified.", true);
-        showForm();
-        return;
+		$fail = true;
     }
 
     if (empty($username)) {
         updateStatus("No username specified.", true);
-        showForm();
-        return;
+		$fail = true;
     }
 
     if (empty($password)) {
         updateStatus("No password specified.", true);
-        showForm();
-        return;
+		$fail = true;
     }
 
     if (empty($sitename)) {
         updateStatus("No sitename specified.", true);
-        showForm();
-        return;
+		$fail = true;
     }
 
+	if($fail){
+		showForm();
+	    return;
+	}
+
     updateStatus("Starting installation...");
     updateStatus("Checking database...");
     $conn = mysql_connect($host, $username, $password);
@@ -239,7 +236,7 @@ function handlePost()
     }
     updateStatus("Writing config file...");
     $sqlUrl = "mysqli://$username:$password@$host/$database";
-    $res = writeConf($sitename, $sqlUrl, $fancy, $path);
+    $res = writeConf($sitename, $sqlUrl, $fancy);
     if (!$res) {
         updateStatus("Can't write config file.", true);
         showForm();
@@ -247,26 +244,26 @@ function handlePost()
     }
     updateStatus("Done!");
     if ($path) $path .= '/';
-    updateStatus("You can visit your <a href='/$path'>new Laconica site</a).");
+    updateStatus("You can visit your <a href='/$path'>new Laconica site</a>.");
 ?>
 
 <?php
 }
 
-function writeConf($sitename, $sqlUrl, $fancy, $path)
+function writeConf($sitename, $sqlUrl, $fancy)
 {
     $res = file_put_contents(INSTALLDIR.'/config.php',
                              "<?php\n".
+                             "if (!defined('LACONICA')) { exit(1); }\n\n".
                              "\$config['site']['name'] = \"$sitename\";\n\n".
                              ($fancy ? "\$config['site']['fancy'] = true;\n\n":'').
-                             "\$config['site']['path'] = \"$path\";\n\n".
-                             "\$config['db']['database'] = \"$sqlUrl\";\n\n");
+                             "\$config['db']['database'] = \"$sqlUrl\";\n\n".
+                             "?>");
     return $res;
 }
 
 function runDbScript($filename, $conn)
 {
-return true;
     $sql = trim(file_get_contents($filename));
     $stmts = explode(';', $sql);
     foreach ($stmts as $stmt) {
@@ -290,13 +287,13 @@ 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 Laconica</title>
-        <link rel="stylesheet" type="text/css" href="theme/base/css/display.css?version=0.8" media="screen, projection, tv"/>
+	<link rel="shortcut icon" href="favicon.ico"/>
         <link rel="stylesheet" type="text/css" href="theme/default/css/display.css?version=0.8" media="screen, projection, tv"/>
         <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/base/css/ie.css?version=0.8" /><![endif]-->
         <!--[if lte IE 6]><link rel="stylesheet" type="text/css" theme/base/css/ie6.css?version=0.8" /><![endif]-->
-        <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/earthy/css/ie.css?version=0.8" /><![endif]-->
-        <script src='js/jquery.min.js'></script>
-        <script src='js/install.js'></script>
+        <!--[if IE]><link rel="stylesheet" type="text/css" href="theme/default/css/ie.css?version=0.8" /><![endif]-->
+        <script src="js/jquery.min.js"></script>
+        <script src="js/install.js"></script>
     </head>
     <body id="install">
         <div id="wrap">