X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Finstall.php;h=8434b38e387f21e7953bc68b9c2163750284cd34;hb=29c671bb22b51f2ee703bfa3f662d4b1b6c6f4aa;hp=182495d258cb7c74b53c517c6eee2e31b65fc47b;hpb=554948c22ae1783876e28793073341a3027a5e4d;p=friendica.git
diff --git a/mod/install.php b/mod/install.php
index 182495d258..8434b38e38 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']);
@@ -84,15 +93,15 @@ function install_post(&$a) {
'$phpath' => $phpath,
'$adminmail' => $adminmail
));
-
+
$result = file_put_contents('.htconfig.php', $txt);
if(! $result) {
$a->data['txt'] = $txt;
}
-
+
$errors = load_database($db);
-
+
if($errors)
$a->data['db_failed'] = $errors;
@@ -177,6 +186,8 @@ function install_content(&$a) {
check_funcs($checks);
+ check_imagik($checks);
+
check_htconfig($checks);
check_smarty3($checks);
@@ -321,7 +332,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(
@@ -428,10 +439,21 @@ function check_funcs(&$checks) {
$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);*/
}
@@ -490,6 +512,24 @@ function check_htaccess(&$checks) {
}
}
+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');