mirror of
https://github.com/friendica/friendica
synced 2024-12-23 01:20:16 +00:00
Merge pull request #3390 from annando/1704-cleaned_install
Added a PDO check in the install routine and cleaned it up
This commit is contained in:
Hypolite Petovan
GitHub
commit
4493f37af3
3 changed files with 65 additions and 102 deletions
|
|
@ -28,7 +28,7 @@ Requirements
|
|||
* Apache with mod-rewrite enabled and "Options All" so you can use a local .htaccess file
|
||||
* PHP 5.4+.
|
||||
* PHP *command line* access with register_argc_argv set to true in the php.ini file
|
||||
* curl, gd, mysql, hash and openssl extensions
|
||||
* Curl, GD, PDO, MySQLi, hash and OpenSSL extensions
|
||||
* 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.)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ Wir planen, diese Einschränkung in einer zukünftigen Version zu beheben.
|
|||
- Apache mit einer aktiverten mod-rewrite-Funktion und dem Eintrag "Options All", so dass du die lokale .htaccess-Datei nutzen kannst
|
||||
- PHP 5.2+. Je neuer, desto besser. Du benötigst 5.3 für die Authentifizierung untereinander. In einer Windows-Umgebung arbeitet die Version 5.2+ möglicherweise nicht, da die Funktion dns_get_record() erst ab Version 5.3 verfügbar ist.
|
||||
- PHP *Kommandozeilen*-Zugang mit register_argc_argv auf "true" gesetzt in der php.ini-Datei
|
||||
- curl, gd, mysql und openssl-Erweiterung
|
||||
- Curl, GD, PDO, MySQLi und OpenSSL-Erweiterung
|
||||
- etwas in der Art eines Email-Servers oder eines Gateways wie PHP mail()
|
||||
- Mysql 5.x
|
||||
- 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]
|
||||
|
|
|
|||
163
mod/install.php
163
mod/install.php
|
|
@ -7,7 +7,7 @@ $install_wizard_pass=1;
|
|||
function install_init(App $a) {
|
||||
|
||||
// $baseurl/install/testrwrite to test if rewite in .htaccess is working
|
||||
if ($a->argc==2 && $a->argv[1]=="testrewrite") {
|
||||
if ($a->argc == 2 && $a->argv[1] == "testrewrite") {
|
||||
echo "ok";
|
||||
killme();
|
||||
}
|
||||
|
|
@ -18,7 +18,7 @@ function install_init(App $a) {
|
|||
$a->theme['stylesheet'] = App::get_baseurl()."/view/install/style.css";
|
||||
|
||||
global $install_wizard_pass;
|
||||
if (x($_POST,'pass')) {
|
||||
if (x($_POST, 'pass')) {
|
||||
$install_wizard_pass = intval($_POST['pass']);
|
||||
}
|
||||
|
||||
|
|
@ -43,27 +43,8 @@ function install_post(App $a) {
|
|||
require_once("include/dba.php");
|
||||
unset($db);
|
||||
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
|
||||
/*if(get_db_errno()) {
|
||||
unset($db);
|
||||
$db = new dba($dbhost, $dbuser, $dbpass, '', true);
|
||||
|
||||
if(! get_db_errno()) {
|
||||
$r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci",
|
||||
dbesc($dbdata)
|
||||
);
|
||||
if ($r) {
|
||||
unset($db);
|
||||
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
|
||||
} else {
|
||||
$a->data['db_create_failed']=true;
|
||||
}
|
||||
} else {
|
||||
$a->data['db_conn_failed']=true;
|
||||
return;
|
||||
}
|
||||
}*/
|
||||
if (get_db_errno()) {
|
||||
$a->data['db_conn_failed']=true;
|
||||
if (!$db->connected) {
|
||||
$a->data['db_conn_failed'] = true;
|
||||
}
|
||||
|
||||
return;
|
||||
|
|
@ -117,14 +98,6 @@ function install_post(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
function get_db_errno() {
|
||||
if (class_exists('mysqli')) {
|
||||
return mysqli_connect_errno();
|
||||
} else {
|
||||
return mysql_errno();
|
||||
}
|
||||
}
|
||||
|
||||
function install_content(App $a) {
|
||||
|
||||
global $install_wizard_pass, $db;
|
||||
|
|
@ -134,30 +107,30 @@ function install_content(App $a) {
|
|||
|
||||
|
||||
|
||||
if (x($a->data,'db_conn_failed')) {
|
||||
if (x($a->data, 'db_conn_failed')) {
|
||||
$install_wizard_pass = 2;
|
||||
$wizard_status = t('Could not connect to database.');
|
||||
$wizard_status = t('Could not connect to database.');
|
||||
}
|
||||
if (x($a->data,'db_create_failed')) {
|
||||
if (x($a->data, 'db_create_failed')) {
|
||||
$install_wizard_pass = 2;
|
||||
$wizard_status = t('Could not create table.');
|
||||
$wizard_status = t('Could not create table.');
|
||||
}
|
||||
|
||||
$db_return_text="";
|
||||
if (x($a->data,'db_installed')) {
|
||||
$db_return_text = "";
|
||||
if (x($a->data, 'db_installed')) {
|
||||
$txt = '<p style="font-size: 130%;">';
|
||||
$txt .= t('Your Friendica site database has been installed.') . EOL;
|
||||
$db_return_text .= $txt;
|
||||
}
|
||||
|
||||
if (x($a->data,'db_failed')) {
|
||||
if (x($a->data, 'db_failed')) {
|
||||
$txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
|
||||
$txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>" ;
|
||||
$txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL ;
|
||||
$txt .= t('Please see the file "INSTALL.txt".') . EOL ."<hr>";
|
||||
$txt .= "<pre>".$a->data['db_failed'] . "</pre>". EOL;
|
||||
$db_return_text .= $txt;
|
||||
}
|
||||
|
||||
if($db && $db->connected) {
|
||||
if ($db && $db->connected) {
|
||||
$r = q("SELECT COUNT(*) as `total` FROM `user`");
|
||||
if (dbm::is_result($r) && $r[0]['total']) {
|
||||
$tpl = get_markup_template('install.tpl');
|
||||
|
|
@ -170,11 +143,11 @@ function install_content(App $a) {
|
|||
}
|
||||
}
|
||||
|
||||
if (x($a->data,'txt') && strlen($a->data['txt'])) {
|
||||
if (x($a->data, 'txt') && strlen($a->data['txt'])) {
|
||||
$db_return_text .= manual_config($a);
|
||||
}
|
||||
|
||||
if ($db_return_text!="") {
|
||||
if ($db_return_text != "") {
|
||||
$tpl = get_markup_template('install.tpl');
|
||||
return replace_macros($tpl, array(
|
||||
'$title' => $install_title,
|
||||
|
|
@ -183,7 +156,7 @@ function install_content(App $a) {
|
|||
));
|
||||
}
|
||||
|
||||
switch ($install_wizard_pass){
|
||||
switch ($install_wizard_pass) {
|
||||
case 1: { // System check
|
||||
|
||||
|
||||
|
|
@ -199,7 +172,7 @@ function install_content(App $a) {
|
|||
|
||||
check_keys($checks);
|
||||
|
||||
if (x($_POST,'phpath')) {
|
||||
if (x($_POST, 'phpath')) {
|
||||
$phpath = notags(trim($_POST['phpath']));
|
||||
}
|
||||
|
||||
|
|
@ -208,7 +181,7 @@ function install_content(App $a) {
|
|||
check_htaccess($checks);
|
||||
|
||||
/// @TODO Maybe move this out?
|
||||
function check_passed($v, $c){
|
||||
function check_passed($v, $c) {
|
||||
if ($c['required']) {
|
||||
$v = $v && $c['status'];
|
||||
}
|
||||
|
|
@ -235,7 +208,7 @@ function install_content(App $a) {
|
|||
|
||||
case 2: { // Database config
|
||||
|
||||
$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
||||
$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
||||
$dbuser = notags(trim($_POST['dbuser']));
|
||||
$dbpass = notags(trim($_POST['dbpass']));
|
||||
$dbdata = notags(trim($_POST['dbdata']));
|
||||
|
|
@ -273,14 +246,14 @@ function install_content(App $a) {
|
|||
}; break;
|
||||
case 3: { // Site settings
|
||||
require_once('include/datetime.php');
|
||||
$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
||||
$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
||||
$dbuser = notags(trim($_POST['dbuser']));
|
||||
$dbpass = notags(trim($_POST['dbpass']));
|
||||
$dbdata = notags(trim($_POST['dbdata']));
|
||||
$phpath = notags(trim($_POST['phpath']));
|
||||
|
||||
$adminmail = notags(trim($_POST['adminmail']));
|
||||
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
|
||||
$timezone = ((x($_POST, 'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
|
||||
/* Installed langs */
|
||||
$lang_choices = get_available_languages();
|
||||
|
||||
|
|
@ -322,7 +295,7 @@ function install_content(App $a) {
|
|||
* required : boolean
|
||||
* help : string optional
|
||||
*/
|
||||
function check_add(&$checks, $title, $status, $required, $help){
|
||||
function check_add(&$checks, $title, $status, $required, $help) {
|
||||
$checks[] = array(
|
||||
'title' => $title,
|
||||
'status' => $status,
|
||||
|
|
@ -333,7 +306,7 @@ function check_add(&$checks, $title, $status, $required, $help){
|
|||
|
||||
function check_php(&$phpath, &$checks) {
|
||||
$passed = $passed2 = $passed3 = false;
|
||||
if (strlen($phpath)){
|
||||
if (strlen($phpath)) {
|
||||
$passed = file_exists($phpath);
|
||||
} else {
|
||||
$phpath = trim(shell_exec('which php'));
|
||||
|
|
@ -342,24 +315,24 @@ function check_php(&$phpath, &$checks) {
|
|||
$help = "";
|
||||
if (!$passed) {
|
||||
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
|
||||
$help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL ;
|
||||
$help .= EOL . EOL ;
|
||||
$help .= t("If you don't have a command line version of PHP installed on 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-poller'>'Setup the poller'</a>") . EOL;
|
||||
$help .= EOL . EOL;
|
||||
$tpl = get_markup_template('field_input.tpl');
|
||||
$help .= replace_macros($tpl, array(
|
||||
'$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')),
|
||||
));
|
||||
$phpath="";
|
||||
$phpath = "";
|
||||
}
|
||||
|
||||
check_add($checks, t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
|
||||
|
||||
if($passed) {
|
||||
if ($passed) {
|
||||
$cmd = "$phpath -v";
|
||||
$result = trim(shell_exec($cmd));
|
||||
$passed2 = ( strpos($result, "(cli)") !== false );
|
||||
$passed2 = ( strpos($result, "(cli)") !== false);
|
||||
list($result) = explode("\n", $result);
|
||||
$help = "";
|
||||
if(!$passed2) {
|
||||
if (!$passed2) {
|
||||
$help .= t('PHP executable is not the php cli binary (could be cgi-fgci version)'). EOL;
|
||||
$help .= t('Found PHP version: ')."<tt>$result</tt>";
|
||||
}
|
||||
|
|
@ -373,7 +346,7 @@ function check_php(&$phpath, &$checks) {
|
|||
$result = trim(shell_exec($cmd));
|
||||
$passed3 = $result == $str;
|
||||
$help = "";
|
||||
if(!$passed3) {
|
||||
if (!$passed3) {
|
||||
$help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL;
|
||||
$help .= t('This is required for message delivery to work.');
|
||||
}
|
||||
|
|
@ -413,12 +386,12 @@ function check_funcs(&$checks) {
|
|||
check_add($ck_funcs, t('libCurl PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('GD graphics PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('OpenSSL PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('mysqli PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('PDO or MySQLi PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('mb_string PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('XML PHP module'), true, true, "");
|
||||
check_add($ck_funcs, t('iconv module'), true, true, "");
|
||||
|
||||
if (function_exists('apache_get_modules')){
|
||||
if (function_exists('apache_get_modules')) {
|
||||
if (! in_array('mod_rewrite',apache_get_modules())) {
|
||||
check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
|
||||
} else {
|
||||
|
|
@ -426,29 +399,33 @@ function check_funcs(&$checks) {
|
|||
}
|
||||
}
|
||||
|
||||
if (! function_exists('curl_init')){
|
||||
$ck_funcs[0]['status']= false;
|
||||
$ck_funcs[0]['help']= t('Error: libCURL PHP module required but not installed.');
|
||||
if (! function_exists('curl_init')) {
|
||||
$ck_funcs[0]['status'] = false;
|
||||
$ck_funcs[0]['help'] = t('Error: libCURL PHP module required but not installed.');
|
||||
}
|
||||
if (! function_exists('imagecreatefromjpeg')){
|
||||
$ck_funcs[1]['status']= false;
|
||||
$ck_funcs[1]['help']= t('Error: GD graphics PHP module with JPEG support required but not installed.');
|
||||
if (! function_exists('imagecreatefromjpeg')) {
|
||||
$ck_funcs[1]['status'] = false;
|
||||
$ck_funcs[1]['help'] = 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']= t('Error: openssl PHP module required but not installed.');
|
||||
$ck_funcs[2]['status'] = false;
|
||||
$ck_funcs[2]['help'] = t('Error: openssl PHP module required but not installed.');
|
||||
}
|
||||
if (! function_exists('mysqli_connect')){
|
||||
$ck_funcs[3]['status']= false;
|
||||
$ck_funcs[3]['help']= t('Error: mysqli PHP module required but not installed.');
|
||||
if (! function_exists('mysqli_connect') && !class_exists('pdo')) {
|
||||
$ck_funcs[3]['status'] = false;
|
||||
$ck_funcs[3]['help'] = t('Error: PDO or MySQLi PHP module required but not installed.');
|
||||
}
|
||||
if (! function_exists('mb_strlen')){
|
||||
$ck_funcs[4]['status']= false;
|
||||
$ck_funcs[4]['help']= t('Error: mb_string 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'] = t('Error: The MySQL driver for PDO is not installed.');
|
||||
}
|
||||
if (! function_exists('iconv_strlen')){
|
||||
$ck_funcs[7]['status']= false;
|
||||
$ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
|
||||
if (! function_exists('mb_strlen')) {
|
||||
$ck_funcs[4]['status'] = false;
|
||||
$ck_funcs[4]['help'] = t('Error: mb_string PHP module required but not installed.');
|
||||
}
|
||||
if (! function_exists('iconv_strlen')) {
|
||||
$ck_funcs[7]['status'] = false;
|
||||
$ck_funcs[7]['help'] = t('Error: iconv PHP module required but not installed.');
|
||||
}
|
||||
|
||||
$checks = array_merge($checks, $ck_funcs);
|
||||
|
|
@ -467,9 +444,9 @@ function check_htconfig(&$checks) {
|
|||
$status = true;
|
||||
$help = "";
|
||||
if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) ||
|
||||
(!file_exists('.htconfig.php') && !is_writable('.')) ) {
|
||||
(!file_exists('.htconfig.php') && !is_writable('.'))) {
|
||||
|
||||
$status=false;
|
||||
$status = false;
|
||||
$help = 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;
|
||||
$help .= 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;
|
||||
$help .= 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;
|
||||
|
|
@ -483,9 +460,9 @@ function check_htconfig(&$checks) {
|
|||
function check_smarty3(&$checks) {
|
||||
$status = true;
|
||||
$help = "";
|
||||
if (!is_writable('view/smarty3') ) {
|
||||
if (!is_writable('view/smarty3')) {
|
||||
|
||||
$status=false;
|
||||
$status = false;
|
||||
$help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;
|
||||
$help .= 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;
|
||||
$help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL;
|
||||
|
|
@ -502,11 +479,11 @@ function check_htaccess(&$checks) {
|
|||
if (function_exists('curl_init')) {
|
||||
$test = fetch_url(App::get_baseurl()."/install/testrewrite");
|
||||
|
||||
if ($test!="ok") {
|
||||
if ($test != "ok") {
|
||||
$test = fetch_url(normalise_link(App::get_baseurl()."/install/testrewrite"));
|
||||
}
|
||||
|
||||
if ($test!="ok") {
|
||||
if ($test != "ok") {
|
||||
$status = false;
|
||||
$help = t('Url rewrite in .htaccess is not working. Check your server configuration.');
|
||||
}
|
||||
|
|
@ -539,15 +516,15 @@ function check_imagik(&$checks) {
|
|||
}
|
||||
|
||||
function manual_config(App $a) {
|
||||
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
|
||||
$data = htmlentities($a->data['txt'],ENT_COMPAT, 'UTF-8');
|
||||
$o = 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.');
|
||||
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
|
||||
return $o;
|
||||
}
|
||||
|
||||
function load_database_rem($v, $i){
|
||||
function load_database_rem($v, $i) {
|
||||
$l = trim($i);
|
||||
if (strlen($l)>1 && ($l[0]=="-" || ($l[0]=="/" && $l[1]=="*"))){
|
||||
if (strlen($l)>1 && ($l[0] == "-" || ($l[0] == "/" && $l[1] == "*"))) {
|
||||
return $v;
|
||||
} else {
|
||||
return $v."\n".$i;
|
||||
|
|
@ -559,18 +536,6 @@ function load_database($db) {
|
|||
require_once("include/dbstructure.php");
|
||||
$errors = update_structure(false, true);
|
||||
|
||||
/* $str = file_get_contents('database.sql');
|
||||
$arr = explode(';',$str);
|
||||
$errors = false;
|
||||
foreach($arr as $a) {
|
||||
if(strlen(trim($a))) {
|
||||
$r = @$db->q(trim($a));
|
||||
if(false === $r) {
|
||||
$errors .= t('Errors encountered creating database tables.') . $a . EOL;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
return $errors;
|
||||
}
|
||||
|
||||
|
|
@ -584,5 +549,3 @@ function what_next() {
|
|||
.t("Go to your new Friendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
|
||||
."</p>";
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue