X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=e30c30689308ae4e9c41c39154b24376c621e481;hb=835e6c4955c9e1c160c02c21e8df7ca7beabd2fb;hp=484846ccd6a1f798d6252ca55c28be25e83693a7;hpb=f23f6ca9c6e358113e2d0d735ac3e1a23d7731dd;p=friendica.git
diff --git a/mod/install.php b/mod/install.php
index 484846ccd6..e30c306893 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -1,4 +1,5 @@
$dbhost,
'$dbuser' => $dbuser,
@@ -85,6 +86,7 @@ function install_post(&$a) {
'$adminmail' => $adminmail
));
+
$result = file_put_contents('.htconfig.php', $txt);
if(! $result) {
$a->data['txt'] = $txt;
@@ -92,6 +94,7 @@ function install_post(&$a) {
$errors = load_database($db);
+
if($errors)
$a->data['db_failed'] = $errors;
else
@@ -148,7 +151,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 +178,8 @@ function install_content(&$a) {
check_funcs($checks);
+ check_imagik($checks);
+
check_htconfig($checks);
check_smarty3($checks);
@@ -231,11 +236,11 @@ function install_content(&$a) {
'$status' => $wizard_status,
- '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, ''),
- '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''),
- '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''),
- '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''),
- '$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.')),
+ '$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'),
+ '$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'),
@@ -274,7 +279,7 @@ function install_content(&$a) {
'$dbdata' => $dbdata,
'$phpath' => $phpath,
- '$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.')),
+ '$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'),
'$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
@@ -319,7 +324,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,6 +395,7 @@ 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, "");
if(function_exists('apache_get_modules')){
@@ -420,9 +426,26 @@ 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 = "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);
+ }
+
+
/*if((x($_SESSION,'sysmsg')) && is_array($_SESSION['sysmsg']) && count($_SESSION['sysmsg']))
notice( t('Please see the file "INSTALL.txt".') . EOL);*/
}
@@ -466,19 +489,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.');