Merge pull request #4625 from annando/ostatus-groups

OStatus: Forum feeds now look like OStatus group feeds

diff --git a/INSTALL.txt b/INSTALL.txt
index 2c2df41a59256bd565efb283fa8a1355c6c00ad9..c9a606eb500638370a419eeaeac832a374853834 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -41,6 +41,8 @@ php.ini file [or see 'poormancron' in section 8]
 
                - some form of email server or email gateway such that PHP mail() works
 
+               - The POSIX module of PHP needs to be activated (e.g. RHEL, CentOS have disabled it)
+
        - Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
 
        - ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks

diff --git a/doc/Install.md b/doc/Install.md
index e711ebbd72dd5f7e16514f4585c73167c398c0d9..5ea1920523e700b206b8417de9891d139c66bd55 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -29,6 +29,7 @@ Requirements
 * PHP 5.6+ (PHP 7 is recommended for performance)
 * PHP *command line* access with register_argc_argv set to true in the php.ini file
 * Curl, GD, PDO, MySQLi, hash, xml, zip and OpenSSL extensions
+* The POSIX module of PHP needs to be activated (e.g. [RHEL, CentOS](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) have disabled it)
 * some form of email server or email gateway such that PHP mail() works
 * Mysql 5.5.3+ or an equivalant alternative for MySQL (MariaDB, Percona Server etc.)
 * the ability to schedule jobs with cron (Linux/Mac) or Scheduled Tasks (Windows) (Note: other options are presented in Section 7 of this document.)

diff --git a/doc/de/Install.md b/doc/de/Install.md
index 5d8145f609a10f119554c36f8e74cec99df86993..182b8b1f7bbacbac24b6c76057eb473f6c03de42 100644 (file)
--- a/doc/de/Install.md
+++ b/doc/de/Install.md
@@ -26,6 +26,7 @@ Wir planen, diese Einschränkung in einer zukünftigen Version zu beheben.
         - PHP *Kommandozeilen*-Zugang mit register_argc_argv auf "true" gesetzt in der php.ini-Datei
         - Curl, GD, PDO, MySQLi, xml, zip und OpenSSL-Erweiterung
         - etwas in der Art eines Email-Servers oder eines Gateways wie PHP mail()
+        - Das POSIX Modul muss aktiviert sein ([CentOS, RHEL](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) haben dies z.B. deaktiviert)
     - Mysql 5.5.3+
     - die Möglichkeit, wiederkehrende Aufgaben mit cron (Linux/Mac) oder "Scheduled Tasks" einzustellen (Windows) [Beachte: andere Optionen sind in Abschnitt 7 dieser Dokumentation zu finden]
     - Installation in einer Top-Level-Domain oder Subdomain (ohne eine Verzeichnis/Pfad-Komponente in der URL) wird bevorzugt. Verzeichnispfade sind für diesen Zweck nicht so günstig und wurden auch nicht ausführlich getestet.

diff --git a/mod/install.php b/mod/install.php
index 4b4940d2777e27ec1a4ef33b6317fe4f1c41e820..eb740c7b64785ad09fa315815d0c4da951344b6d 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -397,7 +397,8 @@ function check_funcs(&$checks) {
        check_add($ck_funcs, L10n::t('PDO or MySQLi PHP module'), true, true, "");
        check_add($ck_funcs, L10n::t('mb_string PHP module'), true, true, "");
        check_add($ck_funcs, L10n::t('XML PHP module'), true, true, "");
-       check_add($ck_funcs, L10n::t('iconv module'), true, true, "");
+       check_add($ck_funcs, L10n::t('iconv PHP module'), true, true, "");
+       check_add($ck_funcs, L10n::t('POSIX PHP module'), true, true, "");
 
        if (function_exists('apache_get_modules')) {
                if (! in_array('mod_rewrite',apache_get_modules())) {
@@ -432,8 +433,12 @@ function check_funcs(&$checks) {
                $ck_funcs[4]['help'] = L10n::t('Error: mb_string PHP module required but not installed.');
        }
        if (! function_exists('iconv_strlen')) {
+               $ck_funcs[6]['status'] = false;
+               $ck_funcs[6]['help'] = L10n::t('Error: iconv PHP module required but not installed.');
+       }
+       if (! function_exists('posix_kill')) {
                $ck_funcs[7]['status'] = false;
-               $ck_funcs[7]['help'] = L10n::t('Error: iconv PHP module required but not installed.');
+               $ck_funcs[7]['help'] = L10n::t('Error: POSIX PHP module required but not installed.');
        }
 
        $checks = array_merge($checks, $ck_funcs);
@@ -442,8 +447,8 @@ function check_funcs(&$checks) {
        try {
                $xml = new DOMDocument();
        } catch (Exception $e) {
-               $ck_funcs[6]['status'] = false;
-               $ck_funcs[6]['help'] = L10n::t('Error, XML PHP module required but not installed.');
+               $ck_funcs[5]['status'] = false;
+               $ck_funcs[5]['help'] = L10n::t('Error, XML PHP module required but not installed.');
        }
 }
 

diff --git a/util/credits.txt b/util/credits.txt
index 46647c9d455234530f77613d86bc934b98fc6e3f..c6a5c3f31912a079526a4a9317c79c12c7e1888a 100644 (file)
--- a/util/credits.txt
+++ b/util/credits.txt
@@ -29,7 +29,6 @@ beardyunixer
 Beatriz Vital
 Ben Roberts
 ben-utzer
-Benjamin Lorteau
 bufalo1973
 Calango Jr
 Carlos Solís