define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.12-dev');
define('DFRN_PROTOCOL_VERSION', '2.23');
-define('DB_UPDATE_VERSION', 1284);
+define('DB_UPDATE_VERSION', 1285);
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/**
"hidden": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
"archive": {"type": "boolean", "not null": "1", "default": "0", "comment": ""},
"pending": {"type": "boolean", "not null": "1", "default": "1", "comment": ""},
+ "deleted": {"type": "boolean", "not null": "1", "default": "0", "comment": "Contact has been deleted"},
"rating": {"type": "tinyint", "not null": "1", "default": "0", "comment": ""},
"reason": {"type": "text", "comment": ""},
"closeness": {"type": "tinyint unsigned", "not null": "1", "default": "99", "comment": ""},
-- ------------------------------------------
-- Friendica 2018.12-dev (The Tazmans Flax-lily)
--- DB_UPDATE_VERSION 1284
+-- DB_UPDATE_VERSION 1285
-- ------------------------------------------
`hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
`archive` boolean NOT NULL DEFAULT '0' COMMENT '',
`pending` boolean NOT NULL DEFAULT '1' COMMENT '',
+ `deleted` boolean NOT NULL DEFAULT '0' COMMENT 'Contact has been deleted',
`rating` tinyint NOT NULL DEFAULT 0 COMMENT '',
`reason` text COMMENT '',
`closeness` tinyint unsigned NOT NULL DEFAULT 99 COMMENT '',
'content' => visible_whitespace($bbcode)
];
+ $html2 = Text\BBCode::convert($bbcode);
+ $results[] = [
+ 'title' => L10n::t('HTML::toBBCode => BBCode::convert'),
+ 'content' => $html2
+ ];
+
+ $results[] = [
+ 'title' => L10n::t('HTML::toBBCode => BBCode::convert (raw HTML)'),
+ 'content' => htmlspecialchars($html2)
+ ];
+
$markdown = Text\HTML::toMarkdown($html);
$results[] = [
'title' => L10n::t('HTML::toMarkdown'),
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\Database\DBStructure;
use Friendica\Util\Temporal;
$install_wizard_pass = 1;
// connect to db
DBA::connect($dbhost, $dbuser, $dbpass, $dbdata);
- $errors = Install::createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
+ $install = new Install();
- if ($errors) {
- $a->data['db_failed'] = $errors;
+ $errors = $install->createConfig($phpath, $urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $timezone, $language, $adminmail, $a->getBasePath());
+
+ if ($errors !== true) {
+ $a->data['data'] = $errors;
return;
}
- $errors = Install::installDatabaseStructure();
+ $errors = DBStructure::update(false, true, true);
if ($errors) {
$a->data['db_failed'] = $errors;
$phpath = defaults($_POST, 'phpath', 'php');
- list($checks, $checkspassed) = Install::check($phpath);
+ $install = new Install($phpath);
+
+ $status = $install->checkAll($a->getBasePath(), $a->getBaseURL());
$tpl = get_markup_template('install_checks.tpl');
$o .= replace_macros($tpl, [
'$title' => $install_title,
'$pass' => L10n::t('System check'),
- '$checks' => $checks,
- '$passed' => $checkspassed,
+ '$checks' => $install->getChecks(),
+ '$passed' => $status,
'$see_install' => L10n::t('Please see the file "INSTALL.txt".'),
'$next' => L10n::t('Next'),
'$reload' => L10n::t('Check again'),
'$phpath' => $phpath,
- '$baseurl' => System::baseUrl(),
+ '$baseurl' => $a->getBaseURL(),
]);
return $o;
}; break;
'$lbl_10' => L10n::t('Please select a default timezone for your website'),
- '$baseurl' => System::baseUrl(),
+ '$baseurl' => $a->getBaseURL(),
'$phpath' => $phpath,
'$timezone' => Temporal::getTimezoneField('timezone', L10n::t('Please select a default timezone for your website'), $timezone, ''),
'$language' => ['language', L10n::t('System Language:'), 'en', L10n::t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices],
- '$baseurl' => System::baseUrl(),
-
-
+ '$baseurl' => $a->getBaseURL(),
'$submit' => L10n::t('Submit'),
$text = preg_replace("/\s?\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "[share$1]$2[/share]", $text);
$text = preg_replace("/\s?\[quote(.*?)\]\s?(.*?)\s?\[\/quote\]\s?/ism", "[quote$1]$2[/quote]", $text);
- $text = preg_replace("/\n\[code\]/ism", "[code]", $text);
- $text = preg_replace("/\[\/code\]\n/ism", "[/code]", $text);
-
// when the content is meant exporting to other systems then remove the avatar picture since this doesn't really look good on these systems
if (!$try_oembed) {
$text = preg_replace("/\[share(.*?)avatar\s?=\s?'.*?'\s?(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "\n[share$1$2]$3[/share]", $text);
$text = Smilies::replace($text, false, true);
}
- // Replace inline code blocks
- $text = preg_replace_callback("|(?!<br[^>]*>)<code>([^<]*)</code>(?!<br[^>]*>)|ism",
- function ($match) use ($simple_html) {
- $return = '<key>' . $match[1] . '</key>';
- // Use <code> for Diaspora inline code blocks
- if ($simple_html === 3) {
- $return = '<code>' . $match[1] . '</code>';
- }
- return $return;
- }
- , $text);
-
// Unhide all [noparse] contained bbtags unspacefying them
// and triming the [noparse] tag.
namespace Friendica\Core\Console;
use Asika\SimpleConsole\Console;
-use Friendica\App;
use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Core\Install;
use Friendica\Core\Theme;
use Friendica\Database\DBA;
+use Friendica\Database\DBStructure;
use RuntimeException;
-require_once 'mod/install.php';
require_once 'include/dba.php';
class AutomaticInstallation extends Console
$a = BaseObject::getApp();
+ $install = new Install();
+
// if a config file is set,
$config_file = $this->getOption(['f', 'file']);
$db_user = $this->getOption(['U', 'dbuser'], ($save_db) ? getenv('MYSQL_USER') . getenv('MYSQL_USERNAME') : '');
$db_pass = $this->getOption(['P', 'dbpass'], ($save_db) ? getenv('MYSQL_PASSWORD') : '');
$url_path = $this->getOption(['u', 'urlpath'], (!empty('FRIENDICA_URL_PATH')) ? getenv('FRIENDICA_URL_PATH') : null);
- $php_path = $this->getOption(['b', 'phppath'], (!empty('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : '');
+ $php_path = $this->getOption(['b', 'phppath'], (!empty('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : null);
$admin_mail = $this->getOption(['A', 'admin'], (!empty('FRIENDICA_ADMIN_MAIL')) ? getenv('FRIENDICA_ADMIN_MAIL') : '');
$tz = $this->getOption(['T', 'tz'], (!empty('FRIENDICA_TZ')) ? getenv('FRIENDICA_TZ') : '');
$lang = $this->getOption(['L', 'lang'], (!empty('FRIENDICA_LANG')) ? getenv('FRIENDICA_LANG') : '');
- Install::createConfig(
+ $install->createConfig(
+ $php_path,
$url_path,
((!empty($db_port)) ? $db_host . ':' . $db_port : $db_host),
$db_user,
$db_pass,
$db_data,
- $php_path,
$tz,
$lang,
- $admin_mail
+ $admin_mail,
+ $a->getBasePath()
);
}
$this->out("Checking basic setup...\n");
$checkResults = [];
- $checkResults['basic'] = $this->runBasicChecks($a);
+
+ $this->runBasicChecks($install);
+
+ $checkResults['basic'] = $install->getChecks();
$errorMessage = $this->extractErrors($checkResults['basic']);
if ($errorMessage !== '') {
// Install database
$this->out("Inserting data into database...\n");
- $checkResults['data'] = Install::installDatabaseStructure();
+ $checkResults['data'] = DBStructure::update(false, true, true);
if ($checkResults['data'] !== '') {
throw new RuntimeException("ERROR: DB Database creation error. Is the DB empty?\n");
}
/**
- * @param App $app
- * @return array
+ * @param Install $install the Installer instance
*/
- private function runBasicChecks($app)
+ private function runBasicChecks(Install $install)
{
- $checks = [];
-
- Install::checkFunctions($checks);
- Install::checkImagick($checks);
- Install::checkLocalIni($checks);
- Install::checkSmarty3($checks);
- Install::checkKeys($checks);
+ $install->resetChecks();
+ $install->checkFunctions();
+ $install->checkImagick();
+ $install->checkLocalIni();
+ $install->checkSmarty3();
+ $install->checkKeys();
if (!empty(Config::get('config', 'php_path'))) {
- Install::checkPHP(Config::get('config', 'php_path'), $checks);
+ if (!$install->checkPHP(Config::get('config', 'php_path'), true)) {
+ throw new RuntimeException(" ERROR: The php_path is not valid in the config.\n");
+ }
} else {
throw new RuntimeException(" ERROR: The php_path is not set in the config.\n");
}
$this->out(" NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.\n");
-
- return $checks;
}
/**
* @param $db_user
* @param $db_pass
* @param $db_data
+ *
* @return array
*/
private function runDatabaseCheck($db_host, $db_user, $db_pass, $db_data)
use DOMDocument;
use Exception;
-use Friendica\BaseObject;
-use Friendica\Database\DBStructure;
use Friendica\Object\Image;
use Friendica\Util\Network;
/**
* Contains methods for installation purpose of Friendica
*/
-class Install extends BaseObject
+class Install
{
/**
- * Checks the current installation environment. There are optional and mandatory checks.
+ * @var array the check outcomes
+ */
+ private $checks;
+
+ /**
+ * Returns all checks made
*
- * @param string $phpath Optional path to the PHP binary (Default is 'php')
+ * @return array the checks
+ */
+ public function getChecks()
+ {
+ return $this->checks;
+ }
+
+ /**
+ * Resets all checks
+ */
+ public function resetChecks()
+ {
+ $this->checks = [];
+ }
+
+ /**
+ * Install constructor.
*
- * @return array First element is a list of all checks and their results,
- * the second element is a list of passed checks
*/
- public static function check($phpath = 'php')
+ public function __construct()
{
- $checks = [];
+ $this->checks = [];
+ }
- self::checkFunctions($checks);
+ /**
+ * Checks the current installation environment. There are optional and mandatory checks.
+ *
+ * @param string $basepath The basepath of Friendica
+ * @param string $baseurl The baseurl of Friendica
+ * @param string $phpath Optional path to the PHP binary
+ *
+ * @return bool if the check succeed
+ */
+ public function checkAll($basepath, $baseurl, $phpath = null)
+ {
+ $returnVal = true;
- self::checkImagick($checks);
+ if (isset($phpath)) {
+ if (!$this->checkPHP($phpath)) {
+ $returnVal = false;
+ }
+ }
- self::checkLocalIni($checks);
+ if (!$this->checkFunctions()) {
+ $returnVal = false;
+ }
- self::checkSmarty3($checks);
+ if (!$this->checkImagick()) {
+ $returnVal = false;
+ }
- self::checkKeys($checks);
+ if (!$this->checkLocalIni()) {
+ $returnVal = false;
+ }
- self::checkPHP($phpath, $checks);
+ if (!$this->checkSmarty3()) {
+ $returnVal = false;
+ }
- self::checkHtAccess($checks);
+ if (!$this->checkKeys()) {
+ $returnVal = false;
+ }
- $checkspassed = array_reduce($checks,
- function ($v, $c) {
- if (!empty($c['require'])) {
- $v = $v && $c['status'];
- }
- return $v;
- },
- true);
+ if (!$this->checkHtAccess($basepath, $baseurl)) {
+ $returnVal = false;
+ }
- return array($checks, $checkspassed);
+ return $returnVal;
}
/**
* @param string $dbuser Username of the Database connection credentials
* @param string $dbpass Password of the Database connection credentials
* @param string $dbdata Name of the Database
- * @param string $phpath Path to the PHP-Binary (e.g. 'php' or '/usr/bin/php')
* @param string $timezone Timezone of the Friendica Installaton (e.g. 'Europe/Berlin')
* @param string $language 2-letter ISO 639-1 code (eg. 'en')
* @param string $adminmail Mail-Adress of the administrator
+ * @param string $basepath The basepath of Friendica
+ * @param string $phpath Path to the PHP-Binary (optional, if not set e.g. 'php' or '/usr/bin/php')
+ *
+ * @return bool|string true if the config was created, the text if something went wrong
*/
- public static function createConfig($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail)
+ public function createConfig($phppath, $urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $timezone, $language, $adminmail, $basepath)
{
$tpl = get_markup_template('local.ini.tpl');
$txt = replace_macros($tpl,[
+ '$phpath' => $phppath,
'$dbhost' => $dbhost,
'$dbuser' => $dbuser,
'$dbpass' => $dbpass,
'$timezone' => $timezone,
'$language' => $language,
'$urlpath' => $urlpath,
- '$phpath' => $phpath,
'$adminmail' => $adminmail,
]);
- $app = self::getApp();
+ $result = file_put_contents($basepath . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php', $txt);
- $result = file_put_contents($app->getBasePath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.ini.php', $txt);
if (!$result) {
- $app->data['txt'] = $txt;
+ return $txt;
+ } else {
+ return true;
}
}
/**
* Adds new checks to the array $checks
*
- * @param array $checks The list of all checks (by-ref parameter!)
* @param string $title The title of the current check
* @param bool $status 1 = check passed, 0 = check not passed
* @param bool $required 1 = check is mandatory, 0 = check is optional
* @param string $help A help-string for the current check
* @param string $error_msg Optional. A error message, if the current check failed
*/
- private static function addCheck(&$checks, $title, $status, $required, $help, $error_msg = "")
+ private function addCheck($title, $status, $required, $help, $error_msg = "")
{
- $checks[] = [
+ array_push($this->checks, [
'title' => $title,
'status' => $status,
'required' => $required,
'help' => $help,
'error_msg' => $error_msg,
- ];
+ ]);
}
/**
* - Checks if it is the CLI version
* - Checks if "register_argc_argv" is enabled
*
- * @param string $phpath Optional. The Path to the PHP-Binary
- * @param array $checks The list of all checks (by-ref parameter!)
+ * @param string $phppath Optional. The Path to the PHP-Binary
+ * @param bool $required Optional. If set to true, the PHP-Binary has to exist (Default false)
+ *
+ * @return bool false if something required failed
*/
- public static function checkPHP($phpath, &$checks)
+ public function checkPHP($phppath = null, $required = false)
{
$passed = $passed2 = $passed3 = false;
- if (strlen($phpath)) {
- $passed = file_exists($phpath);
+ if (isset($phppath)) {
+ $passed = file_exists($phppath);
} else {
- $phpath = trim(shell_exec('which php'));
- $passed = strlen($phpath);
+ $phppath = trim(shell_exec('which php'));
+ $passed = strlen($phppath);
}
+
$help = "";
if (!$passed) {
$help .= L10n::t('Could not find a command line version of PHP in the web server PATH.') . EOL;
$help .= EOL . EOL;
$tpl = get_markup_template('field_input.tpl');
$help .= replace_macros($tpl, [
- '$field' => ['phpath', L10n::t('PHP executable path'), $phpath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
+ '$field' => ['phpath', L10n::t('PHP executable path'), $phppath, L10n::t('Enter full path to php executable. You can leave this blank to continue the installation.')],
]);
- $phpath = "";
+ $phppath = "";
}
- self::addCheck($checks, L10n::t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
+ $this->addCheck(L10n::t('Command line PHP') . ($passed ? " (<tt>$phppath</tt>)" : ""), $passed, false, $help);
if ($passed) {
- $cmd = "$phpath -v";
+ $cmd = "$phppath -v";
$result = trim(shell_exec($cmd));
$passed2 = (strpos($result, "(cli)") !== false);
list($result) = explode("\n", $result);
$help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29") . EOL;
$help .= L10n::t('Found PHP version: ') . "<tt>$result</tt>";
}
- self::addCheck($checks, L10n::t('PHP cli binary'), $passed2, true, $help);
+ $this->addCheck(L10n::t('PHP cli binary'), $passed2, true, $help);
+ } else {
+ // return if it was required
+ return $required;
}
if ($passed2) {
$str = autoname(8);
- $cmd = "$phpath testargs.php $str";
+ $cmd = "$phppath testargs.php $str";
$result = trim(shell_exec($cmd));
$passed3 = $result == $str;
$help = "";
if (!$passed3) {
$help .= L10n::t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
$help .= L10n::t('This is required for message delivery to work.');
+ } else {
+ $this->phppath = $phppath;
}
- self::addCheck($checks, L10n::t('PHP register_argc_argv'), $passed3, true, $help);
+
+ $this->addCheck(L10n::t('PHP register_argc_argv'), $passed3, true, $help);
}
+
+ // passed2 & passed3 are required if first check passed
+ return $passed2 && $passed3;
}
/**
*
* - Checks, if the command "openssl_pkey_new" is available
*
- * @param array $checks The list of all checks (by-ref parameter!)
+ * @return bool false if something required failed
*/
- public static function checkKeys(&$checks)
+ public function checkKeys()
{
$help = '';
$res = false;
+ $status = true;
if (function_exists('openssl_pkey_new')) {
$res = openssl_pkey_new([
if (!$res) {
$help .= L10n::t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
$help .= L10n::t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
+ $status = false;
+ }
+ $this->addCheck(L10n::t('Generate encryption keys'), $res, true, $help);
+
+ return $status;
+ }
+
+ /**
+ * PHP basic function check
+ *
+ * @param string $name The name of the function
+ * @param string $title The (localized) title of the function
+ * @param string $help The (localized) help of the function
+ * @param boolean $required If true, this check is required
+ *
+ * @return bool false, if the check failed
+ */
+ private function checkFunction($name, $title, $help, $required)
+ {
+ $currHelp = '';
+ $status = true;
+ if (!function_exists($name)) {
+ $currHelp = $help;
+ $status = false;
}
- self::addCheck($checks, L10n::t('Generate encryption keys'), $res, true, $help);
+ $this->addCheck($title, $status, $required, $currHelp);
+
+ return $status || (!$status && !$required);
}
/**
* - iconv
* - POSIX
*
- * @param array $checks The list of all checks (by-ref parameter!)
+ * @return bool false if something required failed
*/
- public static function checkFunctions(&$checks)
+ public function checkFunctions()
{
- $ck_funcs = [];
- self::addCheck($ck_funcs, L10n::t('libCurl PHP module'), true, true, "");
- self::addCheck($ck_funcs, L10n::t('GD graphics PHP module'), true, true, "");
- self::addCheck($ck_funcs, L10n::t('OpenSSL PHP module'), true, true, "");
- self::addCheck($ck_funcs, L10n::t('PDO or MySQLi PHP module'), true, true, "");
- self::addCheck($ck_funcs, L10n::t('mb_string PHP module'), true, true, "");
- self::addCheck($ck_funcs, L10n::t('XML PHP module'), true, true, "");
- self::addCheck($ck_funcs, L10n::t('iconv PHP module'), true, true, "");
- self::addCheck($ck_funcs, L10n::t('POSIX PHP module'), true, true, "");
+ $returnVal = true;
+ $help = '';
+ $status = true;
if (function_exists('apache_get_modules')) {
- if (! in_array('mod_rewrite',apache_get_modules())) {
- self::addCheck($ck_funcs, L10n::t('Apache mod_rewrite module'), false, true, L10n::t('Error: Apache webserver mod-rewrite module is required but not installed.'));
- } else {
- self::addCheck($ck_funcs, L10n::t('Apache mod_rewrite module'), true, true, "");
+ if (!in_array('mod_rewrite', apache_get_modules())) {
+ $help = L10n::t('Error: Apache webserver mod-rewrite module is required but not installed.');
+ $status = false;
+ $returnVal = false;
}
}
+ $this->addCheck(L10n::t('Apache mod_rewrite module'), $status, true, $help);
- if (!function_exists('curl_init')) {
- $ck_funcs[0]['status'] = false;
- $ck_funcs[0]['help'] = L10n::t('Error: libCURL PHP module required but not installed.');
- }
- if (!function_exists('imagecreatefromjpeg')) {
- $ck_funcs[1]['status'] = false;
- $ck_funcs[1]['help'] = L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.');
- }
- if (!function_exists('openssl_public_encrypt')) {
- $ck_funcs[2]['status'] = false;
- $ck_funcs[2]['help'] = L10n::t('Error: openssl PHP module required but not installed.');
- }
+ $help = '';
+ $status = true;
if (!function_exists('mysqli_connect') && !class_exists('pdo')) {
- $ck_funcs[3]['status'] = false;
- $ck_funcs[3]['help'] = L10n::t('Error: PDO or MySQLi PHP module required but not installed.');
- }
- if (!function_exists('mysqli_connect') && class_exists('pdo') && !in_array('mysql', \PDO::getAvailableDrivers())) {
- $ck_funcs[3]['status'] = false;
- $ck_funcs[3]['help'] = L10n::t('Error: The MySQL driver for PDO is not installed.');
- }
- if (!function_exists('mb_strlen')) {
- $ck_funcs[4]['status'] = false;
- $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: POSIX PHP module required but not installed.');
+ $status = false;
+ $help = L10n::t('Error: PDO or MySQLi PHP module required but not installed.');
+ $returnVal = false;
+ } else {
+ if (!function_exists('mysqli_connect') && class_exists('pdo') && !in_array('mysql', \PDO::getAvailableDrivers())) {
+ $status = false;
+ $help = L10n::t('Error: The MySQL driver for PDO is not installed.');
+ $returnVal = false;
+ }
}
-
- $checks = array_merge($checks, $ck_funcs);
+ $this->addCheck(L10n::t('PDO or MySQLi PHP module'), $status, true, $help);
// check for XML DOM Documents being able to be generated
+ $help = '';
+ $status = true;
try {
$xml = new DOMDocument();
} catch (Exception $e) {
- $ck_funcs[5]['status'] = false;
- $ck_funcs[5]['help'] = L10n::t('Error, XML PHP module required but not installed.');
+ $help = L10n::t('Error, XML PHP module required but not installed.');
+ $status = false;
+ $returnVal = false;
}
+ $this->addCheck(L10n::t('XML PHP module'), $status, true, $help);
+
+ $status = $this->checkFunction('curl_init',
+ L10n::t('libCurl PHP module'),
+ L10n::t('Error: libCURL PHP module required but not installed.'),
+ true
+ );
+ $returnVal = $returnVal ? $status : false;
+
+ $status = $this->checkFunction('imagecreatefromjpeg',
+ L10n::t('GD graphics PHP module'),
+ L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.'),
+ true
+ );
+ $returnVal = $returnVal ? $status : false;
+
+ $status = $this->checkFunction('openssl_public_encrypt',
+ L10n::t('OpenSSL PHP module'),
+ L10n::t('Error: openssl PHP module required but not installed.'),
+ true
+ );
+ $returnVal = $returnVal ? $status : false;
+
+ $status = $this->checkFunction('mb_strlen',
+ L10n::t('mb_string PHP module'),
+ L10n::t('Error: mb_string PHP module required but not installed.'),
+ true
+ );
+ $returnVal = $returnVal ? $status : false;
+
+ $status = $this->checkFunction('iconv_strlen',
+ L10n::t('iconv PHP module'),
+ L10n::t('Error: iconv PHP module required but not installed.'),
+ true
+ );
+ $returnVal = $returnVal ? $status : false;
+
+ $status = $this->checkFunction('posix_kill',
+ L10n::t('POSIX PHP module'),
+ L10n::t('Error: POSIX PHP module required but not installed.'),
+ true
+ );
+ $returnVal = $returnVal ? $status : false;
+
+ return $returnVal;
}
/**
*
* Checks if it's possible to create the "config/local.ini.php"
*
- * @param array $checks The list of all checks (by-ref parameter!)
+ * @return bool false if something required failed
*/
- public static function checkLocalIni(&$checks)
+ public function checkLocalIni()
{
$status = true;
$help = "";
$help .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL;
}
- self::addCheck($checks, L10n::t('config/local.ini.php is writable'), $status, false, $help);
+ $this->addCheck(L10n::t('config/local.ini.php is writable'), $status, false, $help);
+ // Local INI File is not required
+ return true;
}
/**
*
* Checks, if the directory of Smarty3 is writable
*
- * @param array $checks The list of all checks (by-ref parameter!)
+ * @return bool false if something required failed
*/
- public static function checkSmarty3(&$checks)
+ public function checkSmarty3()
{
$status = true;
$help = "";
$help .= L10n::t("Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files \x28.tpl\x29 that it contains.") . EOL;
}
- self::addCheck($checks, L10n::t('view/smarty3 is writable'), $status, true, $help);
+ $this->addCheck(L10n::t('view/smarty3 is writable'), $status, true, $help);
+
+ return $status;
}
/**
*
* Checks, if "url_rewrite" is enabled in the ".htaccess" file
*
- * @param array $checks The list of all checks (by-ref parameter!)
+ * @param string $basepath The basepath of the app
+ * @param string $baseurl The baseurl of the app
+ * @return bool false if something required failed
*/
- public static function checkHtAccess(&$checks)
+ public function checkHtAccess($basepath, $baseurl)
{
$status = true;
$help = "";
$error_msg = "";
if (function_exists('curl_init')) {
- $fetchResult = Network::fetchUrlFull(System::baseUrl() . "/install/testrewrite");
+ $fetchResult = Network::fetchUrlFull($basepath . "/install/testrewrite");
- $url = normalise_link(System::baseUrl() . "/install/testrewrite");
+ $url = normalise_link($baseurl . "/install/testrewrite");
if ($fetchResult->getBody() != "ok") {
$fetchResult = Network::fetchUrlFull($url);
}
$error_msg['url'] = $fetchResult->getRedirectUrl();
$error_msg['msg'] = $fetchResult->getError();
}
- self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);
+
+ $this->addCheck(L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);
} else {
// cannot check modrewrite if libcurl is not installed
/// @TODO Maybe issue warning here?
}
+
+ return $status;
}
/**
*
* Checks, if the imagick module is available
*
- * @param array $checks The list of all checks (by-ref parameter!)
+ * @return bool false if something required failed
*/
- public static function checkImagick(&$checks)
+ public function checkImagick()
{
$imagick = false;
$gif = false;
$gif = true;
}
}
- if ($imagick == false) {
- self::addCheck($checks, L10n::t('ImageMagick PHP extension is not installed'), $imagick, false, "");
+ if (!$imagick) {
+ $this->addCheck(L10n::t('ImageMagick PHP extension is not installed'), $imagick, false, "");
} else {
- self::addCheck($checks, L10n::t('ImageMagick PHP extension is installed'), $imagick, false, "");
+ $this->addCheck(L10n::t('ImageMagick PHP extension is installed'), $imagick, false, "");
if ($imagick) {
- self::addCheck($checks, L10n::t('ImageMagick supports GIF'), $gif, false, "");
+ $this->addCheck(L10n::t('ImageMagick supports GIF'), $gif, false, "");
}
}
- }
-
- /**
- * Installs the Database structure
- *
- * @return string A possible error
- */
- public static function installDatabaseStructure()
- {
- $errors = DBStructure::update(false, true, true);
- return $errors;
+ // Imagick is not required
+ return true;
}
}
}
// Archive the contact
- DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM], ['id' => $id]);
+ DBA::update('contact', ['archive' => true, 'network' => Protocol::PHANTOM, 'deleted' => true], ['id' => $id]);
// Delete it in the background
Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
// Fetch contact data from the contact table for the given user
$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
- FROM `contact` WHERE `addr` = '%s' AND `uid` = %d",
+ FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND NOT `deleted`",
DBA::escape($addr),
intval($uid)
);
if (!DBA::isResult($r)) {
$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
- FROM `contact` WHERE `addr` = '%s' AND `uid` = 0",
+ FROM `contact` WHERE `addr` = '%s' AND `uid` = 0 AND NOT `deleted`",
DBA::escape($addr)
);
}
/// @todo Verify if we can't use Contact::getDetailsByUrl instead of the following
// We first try the nurl (http://server.tld/nick), most common case
- $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid]);
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['nurl' => normalise_link($url), 'uid' => $uid, 'deleted' => false]);
// Then the addr (nick@server.tld)
if (!DBA::isResult($contact)) {
- $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid]);
+ $contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], ['addr' => $url, 'uid' => $uid, 'deleted' => false]);
}
// Then the alias (which could be anything)
if (!DBA::isResult($contact)) {
// The link could be provided as http although we stored it as https
$ssl_url = str_replace('http://', 'https://', $url);
- $condition = ['`alias` IN (?, ?, ?) AND `uid` = ?', $url, normalise_link($url), $ssl_url, $uid];
+ $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, normalise_link($url), $ssl_url, $uid];
$contact = DBA::selectFirst('contact', ['id', 'avatar', 'avatar-date'], $condition);
}
$ret = Probe::uri($contact["url"], $network);
// If Probe::uri fails the network code will be different
- if (($ret["network"] != $contact["network"]) && ($ret["network"] != $network)) {
+ if (($ret["network"] != $contact["network"]) && !in_array($ret["network"], [Protocol::ACTIVITYPUB, $network])) {
return false;
}
{
public static function content()
{
- $addr = defaults($_REQUEST, 'addr', false);
+ $addr = defaults($_GET, 'addr', false);
if ($addr) {
- $url = defaults(Probe::uri($addr), 'url', false);
+ $url = defaults(Probe::uri(trim($addr)), 'url', false);
if ($url) {
goaway($url);
$item = ['author-id' => Contact::getIdForURL($activity['actor']),
'author-link' => $activity['actor']];
+ // Ensure that the contact has got the right network type
+ self::switchContact($item['author-id']);
+
Contact::addRelationship($owner, $contact, $item);
$cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
* @param integer $uid User ID
* @param string $url Profile URL
*/
- private static function switchContact($cid, $uid, $url)
+ public static function switchContact($cid, $uid, $url)
{
$profile = ActivityPub::probeProfile($url);
if (empty($profile)) {
{
$public_contact = Contact::getIdForURL($owner['url'], 0, true);
- $condition = ['uid' => $owner['uid'], 'contact-id' => $owner['id'], 'author-id' => $public_contact,
- 'wall' => true, 'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
+ $condition = ['uid' => 0, 'contact-id' => $public_contact, 'author-id' => $public_contact,
+ 'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
'deleted' => false, 'visible' => true];
$count = DBA::count('item', $condition);
if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['to'][] = $profile['url'];
$contacts[$profile['url']] = $profile['url'];
+
+ if (($key = array_search($profile['url'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
}
}
} else {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
$data['to'][] = $contact['url'];
$contacts[$contact['url']] = $contact['url'];
+
+ if (($key = array_search($profile['url'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
}
}
}
}
- $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity'], ['parent' => $item['parent']]);
+ $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
while ($parent = Item::fetch($parents)) {
// Don't include data from future posts
if ($parent['id'] >= $item['id']) {
}
$profile = APContact::getByURL($parent['author-link'], false);
+ if (!empty($profile) && ($parent['uri'] == $item['thr-parent'])) {
+ $data['to'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
+
+ if (($key = array_search($profile['url'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
+ }
+
if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['cc'][] = $profile['url'];
$contacts[$profile['url']] = $profile['url'];
}
DBA::close($parents);
- return $data;
+ if (($key = array_search($item['author-link'], $data['to'])) !== false) {
+ unset($data['to'][$key]);
+ }
+
+ if (($key = array_search($item['author-link'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
+
+ return ['to' => array_values(array_unique($data['to'])), 'cc' => array_values(array_unique($data['cc']))];
}
/**
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Protocol\Email;
+use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\PortableContact;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
$importer_uid = $contact['uid'];
+ // Possibly switch the remote contact to AP
+ if ($contact['network'] === Protocol::OSTATUS) {
+ ActivityPub\Receiver::switchContact($contact['id'], $importer_uid, $contact['url']);
+ $contact = DBA::selectFirst('contact', [], ['id' => $contact_id]);
+ }
+
+ // We currently don't do anything with AP here
+ if ($contact['network'] === Protocol::ACTIVITYPUB) {
+ return;
+ }
+
// load current friends if possible.
if (($contact['poco'] != "") && ($contact['success_update'] > $contact['failure_update'])) {
$r = q("SELECT count(*) AS total FROM glink
$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
$this->assertConfig('system', 'language', 'de');
- $this->assertConfig('system', 'url_path', '/friendica');
+ $this->assertConfig('system', 'urlpath', '/friendica');
}
/**
$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
$this->assertConfig('system', 'language', 'de');
- $this->assertConfig('system', 'url_path', '/friendica');
+ $this->assertConfig('system', 'urlpath', '/friendica');
}
+ /**
+ * @runTestsInSeparateProcesses
+ */
public function testNoDatabaseConnection()
{
- $this->assertTrue(putenv('MYSQL_USERNAME='));
- $this->assertTrue(putenv('MYSQL_PASSWORD='));
- $this->assertTrue(putenv('MYSQL_DATABASE='));
+ $dbaMock = \Mockery::mock('alias:Friendica\Database\DBA');
+ $dbaMock
+ ->shouldReceive('connected')
+ ->andReturn(false);
$txt = $this->execute(['autoinstall']);
-d|--dbdata <database> The name of the mysql/mariadb database (env MYSQL_DATABASE)
-U|--dbuser <username> The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
-P|--dbpass <password> The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
- -b|--urlpath <url_path> The URL path of Friendica - f.e. '/friendica' (env FRIENDICA_URL_PATH)
+ -u|--urlpath <url_path> The URL path of Friendica - f.e. '/friendica' (env FRIENDICA_URL_PATH)
-b|--phppath <php_path> The path of the PHP binary (env FRIENDICA_PHP_PATH)
-A|--admin <mail> The admin email address of Friendica (env FRIENDICA_ADMIN_MAIL)
-T|--tz <timezone> The timezone of Friendica (env FRIENDICA_TZ)
}
public function execute($args) {
- DBA::disconnect();
$this->app->reload();
array_unshift($args, $this->getExecutablePath());
--- /dev/null
+<?php
+
+// this is in the same namespace as Install for mocking 'function_exists'
+namespace Friendica\Core;
+
+use Friendica\Test\Util\VFSTrait;
+use PHPUnit\Framework\TestCase;
+
+class InstallTest extends TestCase
+{
+ use VFSTrait;
+
+ public function setUp()
+ {
+ parent::setUp(); // TODO: Change the autogenerated stub
+
+ $this->setUpVfsDir();
+ }
+
+ private function assertCheckExist($position, $title, $help, $status, $required, $assertionArray)
+ {
+ $this->assertArraySubset([$position => [
+ 'title' => $title,
+ 'status' => $status,
+ 'required' => $required,
+ 'error_msg' => null,
+ 'help' => $help]
+ ], $assertionArray);
+ }
+
+ /**
+ * Replaces function_exists results with given mocks
+ *
+ * @param array $functions a list from function names and their result
+ */
+ private function setFunctions($functions)
+ {
+ global $phpMock;
+ $phpMock['function_exists'] = function($function) use ($functions) {
+ foreach ($functions as $name => $value) {
+ if ($function == $name) {
+ return $value;
+ }
+ }
+ return '__phpunit_continue__';
+ };
+ }
+
+ /**
+ * @small
+ * @runInSeparateProcess
+ */
+ public function testCheckKeys()
+ {
+ $this->setFunctions(['openssl_pkey_new' => false]);
+ $install = new Install();
+ $this->assertFalse($install->checkKeys());
+
+ $this->setFunctions(['openssl_pkey_new' => true]);
+ $install = new Install();
+ $this->assertTrue($install->checkKeys());
+ }
+
+ /**
+ * @small
+ * @runInSeparateProcess
+ */
+ public function testCheckFunctions()
+ {
+ $this->setFunctions(['curl_init' => false]);
+ $install = new Install();
+ $this->assertFalse($install->checkFunctions());
+ $this->assertCheckExist(3,
+ L10n::t('libCurl PHP module'),
+ L10n::t('Error: libCURL PHP module required but not installed.'),
+ false,
+ true,
+ $install->getChecks());
+
+ $this->setFunctions(['imagecreatefromjpeg' => false]);
+ $install = new Install();
+ $this->assertFalse($install->checkFunctions());
+ $this->assertCheckExist(4,
+ L10n::t('GD graphics PHP module'),
+ L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.'),
+ false,
+ true,
+ $install->getChecks());
+
+ $this->setFunctions(['openssl_public_encrypt' => false]);
+ $install = new Install();
+ $this->assertFalse($install->checkFunctions());
+ $this->assertCheckExist(5,
+ L10n::t('OpenSSL PHP module'),
+ L10n::t('Error: openssl PHP module required but not installed.'),
+ false,
+ true,
+ $install->getChecks());
+
+ $this->setFunctions(['mb_strlen' => false]);
+ $install = new Install();
+ $this->assertFalse($install->checkFunctions());
+ $this->assertCheckExist(6,
+ L10n::t('mb_string PHP module'),
+ L10n::t('Error: mb_string PHP module required but not installed.'),
+ false,
+ true,
+ $install->getChecks());
+
+ $this->setFunctions(['iconv_strlen' => false]);
+ $install = new Install();
+ $this->assertFalse($install->checkFunctions());
+ $this->assertCheckExist(7,
+ L10n::t('iconv PHP module'),
+ L10n::t('Error: iconv PHP module required but not installed.'),
+ false,
+ true,
+ $install->getChecks());
+
+ $this->setFunctions(['posix_kill' => false]);
+ $install = new Install();
+ $this->assertFalse($install->checkFunctions());
+ $this->assertCheckExist(8,
+ L10n::t('POSIX PHP module'),
+ L10n::t('Error: POSIX PHP module required but not installed.'),
+ false,
+ true,
+ $install->getChecks());
+
+ $this->setFunctions([
+ 'curl_init' => true,
+ 'imagecreatefromjpeg' => true,
+ 'openssl_public_encrypt' => true,
+ 'mb_strlen' => true,
+ 'iconv_strlen' => true,
+ 'posix_kill' => true
+ ]);
+ $install = new Install();
+ $this->assertTrue($install->checkFunctions());
+ }
+
+ /**
+ * @small
+ * @runInSeparateProcess
+ */
+ public function testCheckLocalIni()
+ {
+ $this->assertTrue($this->root->hasChild('config/local.ini.php'));
+
+ $install = new Install();
+ $this->assertTrue($install->checkLocalIni());
+
+ $this->delConfigFile('local.ini.php');
+
+ $this->assertFalse($this->root->hasChild('config/local.ini.php'));
+
+ $install = new Install();
+ $this->assertTrue($install->checkLocalIni());
+ }
+
+ /**
+ * @small
+ * @runInSeparateProcess
+ */
+ public function testCheckHtAccessFail()
+ {
+ // Mocking the CURL Response
+ $curlResult = \Mockery::mock('Friendica\Network\CurlResult');
+ $curlResult
+ ->shouldReceive('getBody')
+ ->andReturn('not ok');
+ $curlResult
+ ->shouldReceive('getRedirectUrl')
+ ->andReturn('');
+ $curlResult
+ ->shouldReceive('getError')
+ ->andReturn('test Error');
+
+ // Mocking the CURL Request
+ $networkMock = \Mockery::mock('alias:Friendica\Util\Network');
+ $networkMock
+ ->shouldReceive('fetchUrlFull')
+ ->with('https://test/install/testrewrite')
+ ->andReturn($curlResult);
+ $networkMock
+ ->shouldReceive('fetchUrlFull')
+ ->with('http://test/install/testrewrite')
+ ->andReturn($curlResult);
+
+ // Mocking that we can use CURL
+ $this->setFunctions(['curl_init' => true]);
+
+ // needed because of "normalise_link"
+ require_once __DIR__ . '/../../../include/text.php';
+
+ $install = new Install();
+
+ $this->assertFalse($install->checkHtAccess('https://test', 'https://test'));
+ $this->assertSame('test Error', $install->getChecks()[0]['error_msg']['msg']);
+ }
+
+ /**
+ * @small
+ * @runInSeparateProcess
+ */
+ public function testCheckHtAccessWork()
+ {
+ // Mocking the failed CURL Response
+ $curlResultF = \Mockery::mock('Friendica\Network\CurlResult');
+ $curlResultF
+ ->shouldReceive('getBody')
+ ->andReturn('not ok');
+
+ // Mocking the working CURL Response
+ $curlResultW = \Mockery::mock('Friendica\Network\CurlResult');
+ $curlResultW
+ ->shouldReceive('getBody')
+ ->andReturn('ok');
+
+ // Mocking the CURL Request
+ $networkMock = \Mockery::mock('alias:Friendica\Util\Network');
+ $networkMock
+ ->shouldReceive('fetchUrlFull')
+ ->with('https://test/install/testrewrite')
+ ->andReturn($curlResultF);
+ $networkMock
+ ->shouldReceive('fetchUrlFull')
+ ->with('http://test/install/testrewrite')
+ ->andReturn($curlResultW);
+
+ // Mocking that we can use CURL
+ $this->setFunctions(['curl_init' => true]);
+
+ // needed because of "normalise_link"
+ require_once __DIR__ . '/../../../include/text.php';
+
+ $install = new Install();
+
+ $this->assertTrue($install->checkHtAccess('https://test', 'https://test'));
+ }
+
+ /**
+ * @small
+ * @runInSeparateProcess
+ */
+ public function testImagick()
+ {
+ $imageMock = \Mockery::mock('alias:Friendica\Object\Image');
+ $imageMock
+ ->shouldReceive('supportedTypes')
+ ->andReturn(['image/gif' => 'gif']);
+
+ $install = new Install();
+
+ // even there is no supported type, Imagick should return true (because it is not required)
+ $this->assertTrue($install->checkImagick());
+ $this->assertCheckExist(1,
+ L10n::t('ImageMagick supports GIF'),
+ '',
+ true,
+ false,
+ $install->getChecks());
+ }
+
+ /**
+ * @small
+ * @runInSeparateProcess
+ */
+ public function testImagickNotFound()
+ {
+ $imageMock = \Mockery::mock('alias:Friendica\Object\Image');
+ $imageMock
+ ->shouldReceive('supportedTypes')
+ ->andReturn([]);
+
+ $install = new Install();
+
+ // even there is no supported type, Imagick should return true (because it is not required)
+ $this->assertTrue($install->checkImagick());
+ $this->assertCheckExist(1,
+ L10n::t('ImageMagick supports GIF'),
+ '',
+ false,
+ false,
+ $install->getChecks());
+ }
+}
+
+/**
+ * A workaround to replace the PHP native function_exists with a mocked function
+ *
+ * @param string $function_name the Name of the function
+ *
+ * @return bool true or false
+ */
+function function_exists($function_name)
+{
+ global $phpMock;
+ if (isset($phpMock['function_exists'])) {
+ $result = call_user_func_array($phpMock['function_exists'], func_get_args());
+ if ($result !== '__phpunit_continue__') {
+ return $result;
+ }
+ }
+ return call_user_func_array('\function_exists', func_get_args());
+}
projects / friendica.git / commitdiff