|
|
@@ -5,11 +5,9 @@
|
|
5
|
5
|
|
|
6
|
6
|
use Friendica\App;
|
|
7
|
7
|
use Friendica\Core\L10n;
|
|
|
8
|
+use Friendica\Core\Install;
|
|
8
|
9
|
use Friendica\Core\System;
|
|
9
|
10
|
use Friendica\Database\DBM;
|
|
10
|
|
-use Friendica\Database\DBStructure;
|
|
11
|
|
-use Friendica\Object\Image;
|
|
12
|
|
-use Friendica\Util\Network;
|
|
13
|
11
|
use Friendica\Util\Temporal;
|
|
14
|
12
|
|
|
15
|
13
|
$install_wizard_pass = 1;
|
|
|
@@ -72,34 +70,7 @@ function install_post(App $a) {
|
|
72
|
70
|
// connect to db
|
|
73
|
71
|
dba::connect($dbhost, $dbuser, $dbpass, $dbdata, true);
|
|
74
|
72
|
|
|
75
|
|
- $tpl = get_markup_template('htconfig.tpl');
|
|
76
|
|
- $txt = replace_macros($tpl,[
|
|
77
|
|
- '$dbhost' => $dbhost,
|
|
78
|
|
- '$dbuser' => $dbuser,
|
|
79
|
|
- '$dbpass' => $dbpass,
|
|
80
|
|
- '$dbdata' => $dbdata,
|
|
81
|
|
- '$timezone' => $timezone,
|
|
82
|
|
- '$language' => $language,
|
|
83
|
|
- '$urlpath' => $urlpath,
|
|
84
|
|
- '$phpath' => $phpath,
|
|
85
|
|
- '$adminmail' => $adminmail,
|
|
86
|
|
- '$rino' => $rino
|
|
87
|
|
- ]);
|
|
88
|
|
-
|
|
89
|
|
-
|
|
90
|
|
- $result = file_put_contents('.htconfig.php', $txt);
|
|
91
|
|
- if (! $result) {
|
|
92
|
|
- $a->data['txt'] = $txt;
|
|
93
|
|
- }
|
|
94
|
|
-
|
|
95
|
|
- $errors = load_database();
|
|
96
|
|
-
|
|
97
|
|
-
|
|
98
|
|
- if ($errors) {
|
|
99
|
|
- $a->data['db_failed'] = $errors;
|
|
100
|
|
- } else {
|
|
101
|
|
- $a->data['db_installed'] = true;
|
|
102
|
|
- }
|
|
|
73
|
+ Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino);
|
|
103
|
74
|
|
|
104
|
75
|
return;
|
|
105
|
76
|
break;
|
|
|
@@ -167,37 +138,11 @@ function install_content(App $a) {
|
|
167
|
138
|
switch ($install_wizard_pass) {
|
|
168
|
139
|
case 1: { // System check
|
|
169
|
140
|
|
|
170
|
|
-
|
|
171
|
|
- $checks = [];
|
|
172
|
|
-
|
|
173
|
|
- check_funcs($checks);
|
|
174
|
|
-
|
|
175
|
|
- check_imagik($checks);
|
|
176
|
|
-
|
|
177
|
|
- check_htconfig($checks);
|
|
178
|
|
-
|
|
179
|
|
- check_smarty3($checks);
|
|
180
|
|
-
|
|
181
|
|
- check_keys($checks);
|
|
182
|
|
-
|
|
183
|
141
|
if (x($_POST, 'phpath')) {
|
|
184
|
142
|
$phpath = notags(trim($_POST['phpath']));
|
|
185
|
143
|
}
|
|
186
|
144
|
|
|
187
|
|
- check_php($phpath, $checks);
|
|
188
|
|
-
|
|
189
|
|
- check_htaccess($checks);
|
|
190
|
|
-
|
|
191
|
|
- /// @TODO Maybe move this out?
|
|
192
|
|
- function check_passed($v, $c) {
|
|
193
|
|
- if ($c['required']) {
|
|
194
|
|
- $v = $v && $c['status'];
|
|
195
|
|
- }
|
|
196
|
|
- return $v;
|
|
197
|
|
- }
|
|
198
|
|
- $checkspassed = array_reduce($checks, "check_passed", true);
|
|
199
|
|
-
|
|
200
|
|
-
|
|
|
145
|
+ list($checks, $checkspassed) = Install::check($phpath);
|
|
201
|
146
|
|
|
202
|
147
|
$tpl = get_markup_template('install_checks.tpl');
|
|
203
|
148
|
$o .= replace_macros($tpl, [
|
|
|
@@ -296,241 +241,9 @@ function install_content(App $a) {
|
|
296
|
241
|
}
|
|
297
|
242
|
}
|
|
298
|
243
|
|
|
299
|
|
-/**
|
|
300
|
|
- * checks : array passed to template
|
|
301
|
|
- * title : string
|
|
302
|
|
- * status : boolean
|
|
303
|
|
- * required : boolean
|
|
304
|
|
- * help : string optional
|
|
305
|
|
- */
|
|
306
|
|
-function check_add(&$checks, $title, $status, $required, $help) {
|
|
307
|
|
- $checks[] = [
|
|
308
|
|
- 'title' => $title,
|
|
309
|
|
- 'status' => $status,
|
|
310
|
|
- 'required' => $required,
|
|
311
|
|
- 'help' => $help,
|
|
312
|
|
- ];
|
|
313
|
|
-}
|
|
314
|
|
-
|
|
315
|
|
-function check_php(&$phpath, &$checks) {
|
|
316
|
|
- $passed = $passed2 = $passed3 = false;
|
|
317
|
|
- if (strlen($phpath)) {
|
|
318
|
|
- $passed = file_exists($phpath);
|
|
319
|
|
- } else {
|
|
320
|
|
- $phpath = trim(shell_exec('which php'));
|
|
321
|
|
- $passed = strlen($phpath);
|
|
322
|
|
- }
|
|
323
|
|
- $help = "";
|
|
324
|
|
- if (!$passed) {
|
|
325
|
|
- $help .= L10n::t('Could not find a command line version of PHP in the web server PATH.'). EOL;
|
|
326
|
|
- $help .= L10n::t("If you don't have a command line version of PHP installed on your server, you will not be able to run the background processing. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-worker'>'Setup the worker'</a>") . EOL;
|
|
327
|
|
- $help .= EOL . EOL;
|
|
328
|
|
- $tpl = get_markup_template('field_input.tpl');
|
|
329
|
|
- $help .= replace_macros($tpl, [
|
|
330
|
|
- '$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.')],
|
|
331
|
|
- ]);
|
|
332
|
|
- $phpath = "";
|
|
333
|
|
- }
|
|
334
|
|
-
|
|
335
|
|
- check_add($checks, L10n::t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
|
|
336
|
|
-
|
|
337
|
|
- if ($passed) {
|
|
338
|
|
- $cmd = "$phpath -v";
|
|
339
|
|
- $result = trim(shell_exec($cmd));
|
|
340
|
|
- $passed2 = ( strpos($result, "(cli)") !== false);
|
|
341
|
|
- list($result) = explode("\n", $result);
|
|
342
|
|
- $help = "";
|
|
343
|
|
- if (!$passed2) {
|
|
344
|
|
- $help .= L10n::t("PHP executable is not the php cli binary \x28could be cgi-fgci version\x29"). EOL;
|
|
345
|
|
- $help .= L10n::t('Found PHP version: ')."<tt>$result</tt>";
|
|
346
|
|
- }
|
|
347
|
|
- check_add($checks, L10n::t('PHP cli binary'), $passed2, true, $help);
|
|
348
|
|
- }
|
|
349
|
|
-
|
|
350
|
|
-
|
|
351
|
|
- if ($passed2) {
|
|
352
|
|
- $str = autoname(8);
|
|
353
|
|
- $cmd = "$phpath testargs.php $str";
|
|
354
|
|
- $result = trim(shell_exec($cmd));
|
|
355
|
|
- $passed3 = $result == $str;
|
|
356
|
|
- $help = "";
|
|
357
|
|
- if (!$passed3) {
|
|
358
|
|
- $help .= L10n::t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL;
|
|
359
|
|
- $help .= L10n::t('This is required for message delivery to work.');
|
|
360
|
|
- }
|
|
361
|
|
- check_add($checks, L10n::t('PHP register_argc_argv'), $passed3, true, $help);
|
|
362
|
|
- }
|
|
363
|
|
-
|
|
364
|
|
-
|
|
365
|
|
-}
|
|
366
|
|
-
|
|
367
|
|
-function check_keys(&$checks) {
|
|
368
|
|
-
|
|
369
|
|
- $help = '';
|
|
370
|
|
-
|
|
371
|
|
- $res = false;
|
|
372
|
|
-
|
|
373
|
|
- if (function_exists('openssl_pkey_new')) {
|
|
374
|
|
- $res = openssl_pkey_new([
|
|
375
|
|
- 'digest_alg' => 'sha1',
|
|
376
|
|
- 'private_key_bits' => 4096,
|
|
377
|
|
- 'encrypt_key' => false
|
|
378
|
|
- ]);
|
|
379
|
|
- }
|
|
380
|
|
-
|
|
381
|
|
- // Get private key
|
|
382
|
|
-
|
|
383
|
|
- if (! $res) {
|
|
384
|
|
- $help .= L10n::t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL;
|
|
385
|
|
- $help .= L10n::t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".');
|
|
386
|
|
- }
|
|
387
|
|
- check_add($checks, L10n::t('Generate encryption keys'), $res, true, $help);
|
|
388
|
|
-
|
|
389
|
|
-}
|
|
390
|
|
-
|
|
391
|
|
-
|
|
392
|
|
-function check_funcs(&$checks) {
|
|
393
|
|
- $ck_funcs = [];
|
|
394
|
|
- check_add($ck_funcs, L10n::t('libCurl PHP module'), true, true, "");
|
|
395
|
|
- check_add($ck_funcs, L10n::t('GD graphics PHP module'), true, true, "");
|
|
396
|
|
- check_add($ck_funcs, L10n::t('OpenSSL PHP module'), true, true, "");
|
|
397
|
|
- check_add($ck_funcs, L10n::t('PDO or MySQLi PHP module'), true, true, "");
|
|
398
|
|
- check_add($ck_funcs, L10n::t('mb_string PHP module'), true, true, "");
|
|
399
|
|
- check_add($ck_funcs, L10n::t('XML PHP module'), true, true, "");
|
|
400
|
|
- check_add($ck_funcs, L10n::t('iconv PHP module'), true, true, "");
|
|
401
|
|
- check_add($ck_funcs, L10n::t('POSIX PHP module'), true, true, "");
|
|
402
|
|
-
|
|
403
|
|
- if (function_exists('apache_get_modules')) {
|
|
404
|
|
- if (! in_array('mod_rewrite',apache_get_modules())) {
|
|
405
|
|
- check_add($ck_funcs, L10n::t('Apache mod_rewrite module'), false, true, L10n::t('Error: Apache webserver mod-rewrite module is required but not installed.'));
|
|
406
|
|
- } else {
|
|
407
|
|
- check_add($ck_funcs, L10n::t('Apache mod_rewrite module'), true, true, "");
|
|
408
|
|
- }
|
|
409
|
|
- }
|
|
410
|
|
-
|
|
411
|
|
- if (! function_exists('curl_init')) {
|
|
412
|
|
- $ck_funcs[0]['status'] = false;
|
|
413
|
|
- $ck_funcs[0]['help'] = L10n::t('Error: libCURL PHP module required but not installed.');
|
|
414
|
|
- }
|
|
415
|
|
- if (! function_exists('imagecreatefromjpeg')) {
|
|
416
|
|
- $ck_funcs[1]['status'] = false;
|
|
417
|
|
- $ck_funcs[1]['help'] = L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.');
|
|
418
|
|
- }
|
|
419
|
|
- if (! function_exists('openssl_public_encrypt')) {
|
|
420
|
|
- $ck_funcs[2]['status'] = false;
|
|
421
|
|
- $ck_funcs[2]['help'] = L10n::t('Error: openssl PHP module required but not installed.');
|
|
422
|
|
- }
|
|
423
|
|
- if (! function_exists('mysqli_connect') && !class_exists('pdo')) {
|
|
424
|
|
- $ck_funcs[3]['status'] = false;
|
|
425
|
|
- $ck_funcs[3]['help'] = L10n::t('Error: PDO or MySQLi PHP module required but not installed.');
|
|
426
|
|
- }
|
|
427
|
|
- if (!function_exists('mysqli_connect') && class_exists('pdo') && !in_array('mysql', PDO::getAvailableDrivers())) {
|
|
428
|
|
- $ck_funcs[3]['status'] = false;
|
|
429
|
|
- $ck_funcs[3]['help'] = L10n::t('Error: The MySQL driver for PDO is not installed.');
|
|
430
|
|
- }
|
|
431
|
|
- if (! function_exists('mb_strlen')) {
|
|
432
|
|
- $ck_funcs[4]['status'] = false;
|
|
433
|
|
- $ck_funcs[4]['help'] = L10n::t('Error: mb_string PHP module required but not installed.');
|
|
434
|
|
- }
|
|
435
|
|
- if (! function_exists('iconv_strlen')) {
|
|
436
|
|
- $ck_funcs[6]['status'] = false;
|
|
437
|
|
- $ck_funcs[6]['help'] = L10n::t('Error: iconv PHP module required but not installed.');
|
|
438
|
|
- }
|
|
439
|
|
- if (! function_exists('posix_kill')) {
|
|
440
|
|
- $ck_funcs[7]['status'] = false;
|
|
441
|
|
- $ck_funcs[7]['help'] = L10n::t('Error: POSIX PHP module required but not installed.');
|
|
442
|
|
- }
|
|
443
|
|
-
|
|
444
|
|
- $checks = array_merge($checks, $ck_funcs);
|
|
445
|
|
-
|
|
446
|
|
- // check for XML DOM Documents being able to be generated
|
|
447
|
|
- try {
|
|
448
|
|
- $xml = new DOMDocument();
|
|
449
|
|
- } catch (Exception $e) {
|
|
450
|
|
- $ck_funcs[5]['status'] = false;
|
|
451
|
|
- $ck_funcs[5]['help'] = L10n::t('Error, XML PHP module required but not installed.');
|
|
452
|
|
- }
|
|
453
|
|
-}
|
|
454
|
|
-
|
|
455
|
|
-
|
|
456
|
|
-function check_htconfig(&$checks) {
|
|
457
|
|
- $status = true;
|
|
458
|
|
- $help = "";
|
|
459
|
|
- if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
|
|
460
|
|
- (!file_exists('.htconfig.php') && !is_writable('.'))) {
|
|
461
|
|
-
|
|
462
|
|
- $status = false;
|
|
463
|
|
- $help = L10n::t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL;
|
|
464
|
|
- $help .= L10n::t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL;
|
|
465
|
|
- $help .= L10n::t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL;
|
|
466
|
|
- $help .= L10n::t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL;
|
|
467
|
|
- }
|
|
468
|
|
-
|
|
469
|
|
- check_add($checks, L10n::t('.htconfig.php is writable'), $status, false, $help);
|
|
470
|
|
-
|
|
471
|
|
-}
|
|
472
|
|
-
|
|
473
|
|
-function check_smarty3(&$checks) {
|
|
474
|
|
- $status = true;
|
|
475
|
|
- $help = "";
|
|
476
|
|
- if (!is_writable('view/smarty3')) {
|
|
477
|
|
-
|
|
478
|
|
- $status = false;
|
|
479
|
|
- $help = L10n::t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;
|
|
480
|
|
- $help .= L10n::t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.').EOL;
|
|
481
|
|
- $help .= L10n::t("Please ensure that the user that your web server runs as \x28e.g. www-data\x29 has write access to this folder.").EOL;
|
|
482
|
|
- $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;
|
|
483
|
|
- }
|
|
484
|
|
-
|
|
485
|
|
- check_add($checks, L10n::t('view/smarty3 is writable'), $status, true, $help);
|
|
486
|
|
-
|
|
487
|
|
-}
|
|
488
|
|
-
|
|
489
|
|
-function check_htaccess(&$checks) {
|
|
490
|
|
- $status = true;
|
|
491
|
|
- $help = "";
|
|
492
|
|
- if (function_exists('curl_init')) {
|
|
493
|
|
- $test = Network::fetchUrl(System::baseUrl()."/install/testrewrite");
|
|
494
|
|
-
|
|
495
|
|
- if ($test != "ok") {
|
|
496
|
|
- $test = Network::fetchUrl(normalise_link(System::baseUrl()."/install/testrewrite"));
|
|
497
|
|
- }
|
|
498
|
|
-
|
|
499
|
|
- if ($test != "ok") {
|
|
500
|
|
- $status = false;
|
|
501
|
|
- $help = L10n::t('Url rewrite in .htaccess is not working. Check your server configuration.');
|
|
502
|
|
- }
|
|
503
|
|
- check_add($checks, L10n::t('Url rewrite is working'), $status, true, $help);
|
|
504
|
|
- } else {
|
|
505
|
|
- // cannot check modrewrite if libcurl is not installed
|
|
506
|
|
- /// @TODO Maybe issue warning here?
|
|
507
|
|
- }
|
|
508
|
|
-}
|
|
509
|
|
-
|
|
510
|
|
-function check_imagik(&$checks) {
|
|
511
|
|
- $imagick = false;
|
|
512
|
|
- $gif = false;
|
|
513
|
|
-
|
|
514
|
|
- if (class_exists('Imagick')) {
|
|
515
|
|
- $imagick = true;
|
|
516
|
|
- $supported = Image::supportedTypes();
|
|
517
|
|
- if (array_key_exists('image/gif', $supported)) {
|
|
518
|
|
- $gif = true;
|
|
519
|
|
- }
|
|
520
|
|
- }
|
|
521
|
|
- if ($imagick == false) {
|
|
522
|
|
- check_add($checks, L10n::t('ImageMagick PHP extension is not installed'), $imagick, false, "");
|
|
523
|
|
- } else {
|
|
524
|
|
- check_add($checks, L10n::t('ImageMagick PHP extension is installed'), $imagick, false, "");
|
|
525
|
|
- if ($imagick) {
|
|
526
|
|
- check_add($checks, L10n::t('ImageMagick supports GIF'), $gif, false, "");
|
|
527
|
|
- }
|
|
528
|
|
- }
|
|
529
|
|
-}
|
|
530
|
|
-
|
|
531
|
244
|
function manual_config(App $a) {
|
|
532
|
245
|
$data = htmlentities($a->data['txt'],ENT_COMPAT, 'UTF-8');
|
|
533
|
|
- $o = L10n::t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
|
|
|
246
|
+ $o = L10n::t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server "config/".');
|
|
534
|
247
|
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
|
|
535
|
248
|
return $o;
|
|
536
|
249
|
}
|
|
|
@@ -544,12 +257,6 @@ function load_database_rem($v, $i) {
|
|
544
|
257
|
}
|
|
545
|
258
|
}
|
|
546
|
259
|
|
|
547
|
|
-function load_database() {
|
|
548
|
|
- $errors = DBStructure::update(false, true, true);
|
|
549
|
|
-
|
|
550
|
|
- return $errors;
|
|
551
|
|
-}
|
|
552
|
|
-
|
|
553
|
260
|
function what_next() {
|
|
554
|
261
|
$baseurl = System::baseUrl();
|
|
555
|
262
|
return
|
Philipp Holzer
1 year ago