don't show a warning when dl() disabled

[quix0rs-gnu-social.git] / install.php

diff --git a/install.php b/install.php
index 9bcee275f1973b04b55ffdde02788613fb251210..24e85fe842769b44a73aadb8498ef37462475f2e 100644 (file)
--- a/install.php
+++ b/install.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, 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
@@ -49,8 +49,7 @@ function checkPrereqs()
     }
 
     $reqs = array('gd', 'curl',
-                  'xmlwriter', 'mbstring',
-                  'gettext');
+                  'xmlwriter', 'mbstring');
 
     foreach ($reqs as $req) {
         if (!checkExtension($req)) {
@@ -88,7 +87,7 @@ function checkPrereqs()
 function checkExtension($name)
 {
     if (!extension_loaded($name)) {
-        if (!dl($name.'.so')) {
+        if (!@dl($name.'.so')) {
             return false;
         }
     }
@@ -130,7 +129,7 @@ function showForm()
                 <p class="form_guide">Database hostname</p>
             </li>
             <li>
-            
+
                 <label for="dbtype">Type</label>
                 <input type="radio" name="dbtype" id="fancy-mysql" value="mysql" checked='checked' /> MySQL<br />
                 <input type="radio" name="dbtype" id="dbtype-pgsql" value="pgsql" /> PostgreSQL<br />
@@ -182,7 +181,7 @@ function handlePost()
     $fancy    = !empty($_POST['fancy']);
     $server = $_SERVER['HTTP_HOST'];
     $path = substr(dirname($_SERVER['PHP_SELF']), 1);
-    
+
 ?>
     <dl class="system_notice">
         <dt>Page notice</dt>
@@ -220,7 +219,7 @@ function handlePost()
             showForm();
         return;
     }
-    
+
     switch($dbtype) {
         case 'mysql':
             $db = mysql_db_installer($host, $database, $username, $password);
@@ -230,28 +229,28 @@ function handlePost()
             break;
         default:
     }
-    
+
     if (!$db) {
         // database connection failed, do not move on to create config file.
         return false;
     }
-    
+
     updateStatus("Writing config file...");
     $res = writeConf($sitename, $server, $path, $fancy, $db);
-    
+
     if (!$res) {
         updateStatus("Can't write config file.", true);
         showForm();
         return;
     }
-    
+
     /*
         TODO https needs to be considered
     */
     $link = "http://".$server.'/'.$path;
-    
-    updateStatus("Laconica has been installed at $link");
-    updateStatus("You can visit your <a href='$link'>new Laconica site</a>.");
+
+    updateStatus("StatusNet has been installed at $link");
+    updateStatus("You can visit your <a href='$link'>new StatusNet site</a>.");
 ?>
 
 <?php
@@ -267,7 +266,7 @@ function pgsql_db_installer($host, $database, $username, $password) {
   updateStatus("Starting installation...");
   updateStatus("Checking database...");
   $conn = pg_connect($connstring);
-  
+
   if ($conn ===false) {
     updateStatus("Failed to connect to database: $connstring");
     showForm();
@@ -277,7 +276,7 @@ function pgsql_db_installer($host, $database, $username, $password) {
   //ensure database encoding is UTF8
   $record = pg_fetch_object(pg_query($conn, 'SHOW server_encoding'));
   if ($record->server_encoding != 'UTF8') {
-    updateStatus("Laconica requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
+    updateStatus("StatusNet requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
     showForm();
     return false;
   }
@@ -285,8 +284,8 @@ function pgsql_db_installer($host, $database, $username, $password) {
   updateStatus("Running database script...");
   //wrap in transaction;
   pg_query($conn, 'BEGIN');
-  $res = runDbScript(INSTALLDIR.'/db/laconica_pg.sql', $conn, 'pgsql');
-  
+  $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql');
+
   if ($res === false) {
       updateStatus("Can't run database script.", true);
       showForm();
@@ -312,9 +311,9 @@ function pgsql_db_installer($host, $database, $username, $password) {
   else {
     $sqlUrl = "pgsql://$username:$password@$host/$database";
   }
-  
+
   $db = array('type' => 'pgsql', 'database' => $sqlUrl);
-  
+
   return $db;
 }
 
@@ -336,7 +335,7 @@ function mysql_db_installer($host, $database, $username, $password) {
       return false;
   }
   updateStatus("Running database script...");
-  $res = runDbScript(INSTALLDIR.'/db/laconica.sql', $conn);
+  $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn);
   if ($res === false) {
       updateStatus("Can't run database script.", true);
       showForm();
@@ -354,7 +353,7 @@ function mysql_db_installer($host, $database, $username, $password) {
           return false;
       }
   }
-      
+
       $sqlUrl = "mysqli://$username:$password@$host/$database";
       $db = array('type' => 'mysql', 'database' => $sqlUrl);
       return $db;
@@ -364,23 +363,23 @@ function writeConf($sitename, $server, $path, $fancy, $db)
 {
     // assemble configuration file in a string
     $cfg =  "<?php\n".
-            "if (!defined('LACONICA')) { exit(1); }\n\n".
-            
+            "if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }\n\n".
+
             // site name
             "\$config['site']['name'] = '$sitename';\n\n".
-            
+
             // site location
             "\$config['site']['server'] = '$server';\n".
             "\$config['site']['path'] = '$path'; \n\n".
-            
+
             // checks if fancy URLs are enabled
             ($fancy ? "\$config['site']['fancy'] = true;\n\n":'').
-            
+
             // database
             "\$config['db']['database'] = '{$db['database']}';\n\n".
             ($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
             "\$config['db']['type'] = '{$db['type']}';\n\n".
-            
+
             "?>";
     // write configuration file out to install directory
     $res = file_put_contents(INSTALLDIR.'/config.php', $cfg);
@@ -420,7 +419,7 @@ function runDbScript($filename, $conn, $type = 'mysql')
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
     <head>
-        <title>Install Laconica</title>
+        <title>Install StatusNet</title>
        <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]-->
@@ -434,14 +433,14 @@ function runDbScript($filename, $conn, $type = 'mysql')
             <div id="header">
                 <address id="site_contact" class="vcard">
                     <a class="url home bookmark" href=".">
-                        <img class="logo photo" src="theme/default/logo.png" alt="Laconica"/>
-                        <span class="fn org">Laconica</span>
+                        <img class="logo photo" src="theme/default/logo.png" alt="StatusNet"/>
+                        <span class="fn org">StatusNet</span>
                     </a>
                 </address>
             </div>
             <div id="core">
                 <div id="content">
-                    <h1>Install Laconica</h1>
+                    <h1>Install StatusNet</h1>
 <?php main(); ?>
                 </div>
             </div>