X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=8854723b767adb46985200c077fcf16f2d189e84;hb=f146c85e75314462823076a9d89ac2e698e6de45;hp=1206aa61ea9d621cd2abafa5b4f87af06a0446cd;hpb=2178feab30c6bedbf1206b3e1f141a76301ab5fc;p=friendica.git diff --git a/mod/install.php b/mod/install.php index 1206aa61ea..8854723b76 100755 --- a/mod/install.php +++ b/mod/install.php @@ -4,28 +4,27 @@ require_once "include/Photo.php"; $install_wizard_pass=1; -function install_init(App &$a){ +function install_init(App $a) { // $baseurl/install/testrwrite to test if rewite in .htaccess is working if ($a->argc==2 && $a->argv[1]=="testrewrite") { echo "ok"; killme(); } - + // We overwrite current theme css, because during install we could not have a working mod_rewrite // so we could not have a css at all. Here we set a static css file for the install procedure pages $a->config['system']['theme'] = "../install"; $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']); + } } -function install_post(App &$a) { +function install_post(App $a) { global $install_wizard_pass, $db; switch($install_wizard_pass) { @@ -49,7 +48,7 @@ function install_post(App &$a) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); if(! get_db_errno()) { - $r = q("CREATE DATABASE '%s'", + $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci", dbesc($dbdata) ); if ($r) { @@ -63,7 +62,7 @@ function install_post(App &$a) { return; } }*/ - if(get_db_errno()) { + if (get_db_errno()) { $a->data['db_conn_failed']=true; } @@ -79,14 +78,7 @@ function install_post(App &$a) { $timezone = notags(trim($_POST['timezone'])); $language = notags(trim($_POST['language'])); $adminmail = notags(trim($_POST['adminmail'])); - // In step 4 of the installer, we passed the check for mcrypt - // already, so we can activate RINO, make RINO2 the default - // and only fall back if the mcrypt_create_iv function is - // not available on the system. $rino = 2; - if (! function_exists('mcrypt_create_iv')) { - $rino = 1; - } // connect to db $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); @@ -107,17 +99,18 @@ function install_post(App &$a) { $result = file_put_contents('.htconfig.php', $txt); - if(! $result) { + if (! $result) { $a->data['txt'] = $txt; } $errors = load_database($db); - if($errors) + if ($errors) { $a->data['db_failed'] = $errors; - else + } else { $a->data['db_installed'] = true; + } return; break; @@ -125,13 +118,14 @@ function install_post(App &$a) { } function get_db_errno() { - if(class_exists('mysqli')) + if (class_exists('mysqli')) { return mysqli_connect_errno(); - else + } else { return mysql_errno(); + } } -function install_content(App &$a) { +function install_content(App $a) { global $install_wizard_pass, $db; $o = ''; @@ -140,23 +134,23 @@ 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.'); } - 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.'); } $db_return_text=""; - if(x($a->data,'db_installed')) { + if (x($a->data,'db_installed')) { $txt = '

'; $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 ."

" ; $txt .= "
".$a->data['db_failed'] . "
". EOL ; @@ -176,7 +170,7 @@ 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); } @@ -205,16 +199,19 @@ function install_content(App &$a) { check_keys($checks); - if(x($_POST,'phpath')) + if (x($_POST,'phpath')) { $phpath = notags(trim($_POST['phpath'])); + } check_php($phpath, $checks); - check_htaccess($checks); + check_htaccess($checks); + /// @TODO Maybe move this out? function check_passed($v, $c){ - if ($c['required']) + if ($c['required']) { $v = $v && $c['status']; + } return $v; } $checkspassed = array_reduce($checks, "check_passed", true); @@ -257,7 +254,7 @@ function install_content(App &$a) { '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, '', 'required'), '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, '', 'required', 'autofocus'), - '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, '', 'required'), + '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, t("For security reasons the password must not be empty"), 'required'), '$dbdata' => array('dbdata', t('Database Name'), $dbdata, '', 'required'), '$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'), @@ -343,7 +340,7 @@ function check_php(&$phpath, &$checks) { $passed = strlen($phpath); } $help = ""; - if(!$passed) { + 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 'Setup the poller'") . EOL ; $help .= EOL . EOL ; @@ -370,7 +367,7 @@ function check_php(&$phpath, &$checks) { } - if($passed2) { + if ($passed2) { $str = autoname(8); $cmd = "$phpath testargs.php $str"; $result = trim(shell_exec($cmd)); @@ -392,15 +389,17 @@ function check_keys(&$checks) { $res = false; - if(function_exists('openssl_pkey_new')) - $res=openssl_pkey_new(array( - 'digest_alg' => 'sha1', - 'private_key_bits' => 4096, - 'encrypt_key' => false )); + if (function_exists('openssl_pkey_new')) { + $res = openssl_pkey_new(array( + 'digest_alg' => 'sha1', + 'private_key_bits' => 4096, + 'encrypt_key' => false + )); + } // Get private key - if(! $res) { + if (! $res) { $help .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys'). EOL; $help .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".'); } @@ -416,11 +415,10 @@ function check_funcs(&$checks) { 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('mb_string PHP module'), true, true, ""); - check_add($ck_funcs, t('mcrypt 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 { @@ -428,49 +426,33 @@ function check_funcs(&$checks) { } } - if(! function_exists('curl_init')){ + 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')){ + 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')) { + if (! function_exists('openssl_public_encrypt')) { $ck_funcs[2]['status']= false; $ck_funcs[2]['help']= t('Error: openssl PHP module required but not installed.'); } - if(! function_exists('mysqli_connect')){ + 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('mb_strlen')){ + 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('mcrypt_create_iv')){ - $ck_funcs[5]['status']= false; - $ck_funcs[5]['help']= t('Error: mcrypt PHP module required but not installed.'); - } - if(! function_exists('iconv_strlen')){ + 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); - // check for 'mcrypt_create_iv()', needed for RINO2 - if ($ck_funcs[5]['status']) { - if (function_exists('mcrypt_create_iv')) { - $__status = true; - $__help = t("If you are using php_cli, please make sure that mcrypt module is enabled in its config file"); - } else { - $__status = false; - $__help = t('Function mcrypt_create_iv() is not defined. This is needed to enable RINO2 encryption layer.'); - } - check_add($checks, t('mcrypt_create_iv() function'), $__status, false, $__help); - } - // check for XML DOM Documents being able to be generated try { $xml = new DOMDocument(); @@ -478,16 +460,13 @@ function check_funcs(&$checks) { $ck_funcs[6]['status'] = false; $ck_funcs[6]['help'] = t('Error, XML PHP module required but not installed.'); } - - /*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg'])) - notice( t('Please see the file "INSTALL.txt".') . EOL);*/ } function check_htconfig(&$checks) { $status = true; $help = ""; - if( (file_exists('.htconfig.php') && !is_writable('.htconfig.php')) || + if ((file_exists('.htconfig.php') && !is_writable('.htconfig.php')) || (!file_exists('.htconfig.php') && !is_writable('.')) ) { $status=false; @@ -504,7 +483,7 @@ function check_htconfig(&$checks) { function check_smarty3(&$checks) { $status = true; $help = ""; - if( !is_writable('view/smarty3') ) { + if (!is_writable('view/smarty3') ) { $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; @@ -532,8 +511,7 @@ function check_htaccess(&$checks) { $help = t('Url rewrite in .htaccess is not working. Check your server configuration.'); } check_add($checks, t('Url rewrite is working'), $status, true, $help); - } - else { + } else { // cannot check modrewrite if libcurl is not installed /// @TODO Maybe issue warning here? } @@ -552,8 +530,7 @@ function check_imagik(&$checks) { } if ($imagick == false) { check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, ""); - } - else { + } else { check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, ""); if ($imagick) { check_add($checks, t('ImageMagick supports GIF'), $gif, false, ""); @@ -561,9 +538,7 @@ function check_imagik(&$checks) { } } - - -function manual_config(App &$a) { +function manual_config(App $a) { $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 .= ""; @@ -579,7 +554,6 @@ function load_database_rem($v, $i){ } } - function load_database($db) { require_once("include/dbstructure.php");