$install_wizard_pass=1;
-function install_init(&$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") {
// 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'] = $a->get_baseurl()."/view/install/style.css";
+ $a->theme['stylesheet'] = App::get_baseurl()."/view/install/style.css";
}
-function install_post(&$a) {
+function install_post(App &$a) {
global $install_wizard_pass, $db;
switch($install_wizard_pass) {
$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);
'$language' => $language,
'$urlpath' => $urlpath,
'$phpath' => $phpath,
- '$adminmail' => $adminmail
+ '$adminmail' => $adminmail,
+ '$rino' => $rino
));
return mysql_errno();
}
-function install_content(&$a) {
+function install_content(App &$a) {
global $install_wizard_pass, $db;
$o = '';
if($db && $db->connected) {
$r = q("SELECT COUNT(*) as `total` FROM `user`");
- if($r && count($r) && $r[0]['total']) {
+ if (dbm::is_result($r) && $r[0]['total']) {
$tpl = get_markup_template('install.tpl');
return replace_macros($tpl, array(
'$title' => $install_title,
'$next' => t('Next'),
'$reload' => t('Check again'),
'$phpath' => $phpath,
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => App::get_baseurl(),
));
return $o;
}; break;
'$lbl_10' => t('Please select a default timezone for your website'),
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => App::get_baseurl(),
'$phpath' => $phpath,
$adminmail = notags(trim($_POST['adminmail']));
$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
/* Installed langs */
- $lang_choices = get_avaiable_languages();
+ $lang_choices = get_available_languages();
$tpl = get_markup_template('install_settings.tpl');
$o .= replace_macros($tpl, array(
'$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(),
+ '$baseurl' => App::get_baseurl(),
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 (! in_array('mod_rewrite',apache_get_modules())) {
$ck_funcs[5]['status']= false;
$ck_funcs[5]['help']= t('Error: mcrypt 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);
if ($ck_funcs[5]['status']) {
if (function_exists('mcrypt_create_iv')) {
$__status = true;
- $__help = "If you are using php_cli, please make sure that mcrypt module is enabled in its config file";
+ $__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);*/
}
function check_htaccess(&$checks) {
- $a = get_app();
$status = true;
$help = "";
if (function_exists('curl_init')){
- $test = fetch_url($a->get_baseurl()."/install/testrewrite");
+ $test = fetch_url(App::get_baseurl()."/install/testrewrite");
if ($test!="ok")
- $test = fetch_url(normalise_link($a->get_baseurl()."/install/testrewrite"));
+ $test = fetch_url(normalise_link(App::get_baseurl()."/install/testrewrite"));
if ($test!="ok") {
$status = false;
$gif = true;
}
}
- check_add($checks, t('ImageMagick PHP extension is installed'), $imagick, false, "");
- if ($imagick) {
- check_add($checks, t('ImageMagick supports GIF'), $gif, false, "");
+ if ($imagick == false) {
+ check_add($checks, t('ImageMagick PHP extension is not installed'), $imagick, false, "");
+ }
+ else {
+ 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) {
+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 .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
}
function what_next() {
- $a = get_app();
- $baseurl = $a->get_baseurl();
+ $baseurl = App::get_baseurl();
return
t('<h1>What next</h1>')
."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
projects / friendica.git / blobdiff