X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=f36c91ef2aa0b4fc85303df74f9e2c5a1f8560c3;hb=e1c0b4fe03756a51bd1112ff563cd2f1338f8417;hp=c6fe7083626a6f177ed676a21b07a27825cdd37e;hpb=bf28cc0f754e22cf8c52d017665e32de69208a45;p=friendica.git diff --git a/mod/install.php b/mod/install.php index c6fe708362..f36c91ef2a 100755 --- a/mod/install.php +++ b/mod/install.php @@ -1,4 +1,5 @@ config['system']['theme'] = "../install"; + $a->theme['stylesheet'] = $a->get_baseurl()."/view/install/style.css"; + + + global $install_wizard_pass; if (x($_POST,'pass')) $install_wizard_pass = intval($_POST['pass']); @@ -68,23 +77,35 @@ function install_post(&$a) { $dbdata = notags(trim($_POST['dbdata'])); $phpath = notags(trim($_POST['phpath'])); $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); - $tpl = get_intltext_template('htconfig.tpl'); + $tpl = get_markup_template('htconfig.tpl'); $txt = replace_macros($tpl,array( '$dbhost' => $dbhost, '$dbuser' => $dbuser, '$dbpass' => $dbpass, '$dbdata' => $dbdata, '$timezone' => $timezone, + '$language' => $language, '$urlpath' => $urlpath, '$phpath' => $phpath, - '$adminmail' => $adminmail + '$adminmail' => $adminmail, + '$rino' => $rino )); + $result = file_put_contents('.htconfig.php', $txt); if(! $result) { $a->data['txt'] = $txt; @@ -92,6 +113,7 @@ function install_post(&$a) { $errors = load_database($db); + if($errors) $a->data['db_failed'] = $errors; else @@ -148,7 +170,7 @@ function install_content(&$a) { return replace_macros($tpl, array( '$title' => $install_title, '$pass' => '', - '$status' => t('Permission denied.'), + '$status' => t('Database already in use.'), '$text' => '', )); } @@ -175,6 +197,8 @@ function install_content(&$a) { check_funcs($checks); + check_imagik($checks); + check_htconfig($checks); check_smarty3($checks); @@ -260,6 +284,8 @@ function install_content(&$a) { $adminmail = notags(trim($_POST['adminmail'])); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); + /* Installed langs */ + $lang_choices = get_avaiable_languages(); $tpl = get_markup_template('install_settings.tpl'); $o .= replace_macros($tpl, array( @@ -278,7 +304,7 @@ function install_content(&$a) { '$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''), - + '$language' => array('language', t('System Language:'), 'en', t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices), '$baseurl' => $a->get_baseurl(), @@ -319,7 +345,7 @@ 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 'Activating scheduled tasks'") . 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 ; $tpl = get_markup_template('field_input.tpl'); $help .= replace_macros($tpl, array( @@ -390,7 +416,8 @@ 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, ""); if(function_exists('apache_get_modules')){ if (! in_array('mod_rewrite',apache_get_modules())) { @@ -420,9 +447,33 @@ function check_funcs(&$checks) { $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.'); + } $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(); + } catch (Exception $e) { + $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);*/ } @@ -466,19 +517,40 @@ function check_htaccess(&$checks) { $status = true; $help = ""; if (function_exists('curl_init')){ - $test = fetch_url($a->get_baseurl()."/install/testrewrite"); - if ($test!="ok") { - $status = false; - $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 { - // cannot check modrewrite if libcurl is not installed - } + $test = fetch_url($a->get_baseurl()."/install/testrewrite"); + + if ($test!="ok") + $test = fetch_url(normalise_link($a->get_baseurl()."/install/testrewrite")); + + if ($test!="ok") { + $status = false; + $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 { + // cannot check modrewrite if libcurl is not installed + } +} + +function check_imagik(&$checks) { + $imagick = false; + $gif = false; + if (class_exists('Imagick')) { + $imagick = true; + $supported = Photo::supportedTypes(); + if (array_key_exists('image/gif', $supported)) { + $gif = true; + } + } + check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, ""); + if ($imagick) { + check_add($checks, t('ImageMagick supports GIF'), $gif, false, ""); + } } + function manual_config(&$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.');