OStatus: garbage collect unused PuSH subscriptions when the last local subscriber...

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

diff --git a/install.php b/install.php
index 78a4b8763695141e90738201f96ebc8c52c5a573..435f6d63bf4ffe22f43045568b22cadc92ec0039 100644 (file)
--- a/install.php
+++ b/install.php
@@ -301,7 +301,7 @@ function checkPrereqs()
     }
 
     $reqs = array('gd', 'curl',
-                  'xmlwriter', 'mbstring','tidy');
+                  'xmlwriter', 'mbstring', 'xml', 'dom', 'simplexml');
 
     foreach ($reqs as $req) {
         if (!checkExtension($req)) {
@@ -391,7 +391,7 @@ function showLibs()
         libraries instead, as they tend to provide security updates faster, and may offer improved performance.</p>
         <p>On Debian based distributions, such as Ubuntu, use a package manager (such as &quot;aptitude&quot;, &quot;apt-get&quot;, and &quot;synaptic&quot;) to install the package listed.</p>
         <p>On RPM based distributions, such as Red Hat, Fedora, CentOS, Scientific Linux, Yellow Dog Linux and Oracle Enterprise Linux, use a package manager (such as &quot;yum&quot;, &quot;apt-rpm&quot;, and &quot;up2date&quot;) to install the package listed.</p>
-        <p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP PEAR to install the library. Simply run &quot;pear install &lt;name&gt;&quot;.</p>
+        <p>On servers without a package manager (such as Windows), or if the library is not packaged for your distribution, you can use PHP's PEAR to install the library. Simply run &quot;pear install &lt;name&gt;&quot;.</p>
     </div>
     <h2>Absent Libraries</h2>
     <ul id="absent_libraries">
@@ -454,7 +454,6 @@ function showForm()
     <dd>
         <div class="instructions">
             <p>Enter your database connection information below to initialize the database.</p>
-            <p>StatusNet bundles a number of libraries for ease of installation. <a href="?checklibs=true">You can see what bundled libraries you are using, versus what libraries are installed on your server.</a>
         </div>
     </dd>
 </dl>
@@ -570,7 +569,7 @@ STR;
     $res = writeConf($sitename, $server, $path, $fancy, $db);
 
     if (!$res) {
-        updateStatus("Cannot write config file.", true);
+        updateStatus("Can't write config file.", true);
         showForm();
         return;
     }
@@ -616,7 +615,7 @@ function Pgsql_Db_installer($host, $database, $username, $password)
     $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql');
 
     if ($res === false) {
-        updateStatus("Cannot run database script.", true);
+        updateStatus("Can't run database script.", true);
         showForm();
         return false;
     }
@@ -627,7 +626,7 @@ function Pgsql_Db_installer($host, $database, $username, $password)
         updateStatus(sprintf("Adding %s data to database...", $name));
         $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql');
         if ($res === false) {
-            updateStatus(sprintf("Cannot run %d script.", $name), true);
+            updateStatus(sprintf("Can't run %d script.", $name), true);
             showForm();
             return false;
         }
@@ -652,21 +651,21 @@ function Mysql_Db_installer($host, $database, $username, $password)
 
     $conn = mysql_connect($host, $username, $password);
     if (!$conn) {
-        updateStatus("Cannot connect to server '$host' as '$username'.", true);
+        updateStatus("Can't connect to server '$host' as '$username'.", true);
         showForm();
         return false;
     }
     updateStatus("Changing to database...");
     $res = mysql_select_db($database, $conn);
     if (!$res) {
-        updateStatus("Cannot change to database.", true);
+        updateStatus("Can't change to database.", true);
         showForm();
         return false;
     }
     updateStatus("Running database script...");
     $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn);
     if ($res === false) {
-        updateStatus("Cannot run database script.", true);
+        updateStatus("Can't run database script.", true);
         showForm();
         return false;
     }
@@ -677,7 +676,7 @@ function Mysql_Db_installer($host, $database, $username, $password)
         updateStatus(sprintf("Adding %s data to database...", $name));
         $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn);
         if ($res === false) {
-            updateStatus(sprintf("Cannot run %d script.", $name), true);
+            updateStatus(sprintf("Can't run %d script.", $name), true);
             showForm();
             return false;
         }