Merge pull request #2190 from annando/1512-getload

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index ed07c4ea6a2192f08b1e00476cf440606d693d90..8434b38e387f21e7953bc68b9c2163750284cd34 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -1,4 +1,5 @@
 <?php
+require_once "include/Photo.php";
 
 $install_wizard_pass=1;
 
@@ -10,6 +11,14 @@ function install_init(&$a){
                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'] = $a->get_baseurl()."/view/install/style.css";
+       
+       
+       
        global $install_wizard_pass;
        if (x($_POST,'pass'))
                $install_wizard_pass = intval($_POST['pass']);
@@ -73,7 +82,7 @@ function install_post(&$a) {
                        // 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,
@@ -85,6 +94,7 @@ function install_post(&$a) {
                                '$adminmail' => $adminmail
                        ));
 
+
                        $result = file_put_contents('.htconfig.php', $txt);
                        if(! $result) {
                                $a->data['txt'] = $txt;
@@ -92,6 +102,7 @@ function install_post(&$a) {
 
                        $errors = load_database($db);
 
+
                        if($errors)
                                $a->data['db_failed'] = $errors;
                        else
@@ -148,7 +159,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 +186,8 @@ function install_content(&$a) {
 
                        check_funcs($checks);
 
+                       check_imagik($checks);
+
                        check_htconfig($checks);
 
                        check_smarty3($checks);
@@ -319,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 <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>") . 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 <a href='https://github.com/friendica/friendica/blob/master/doc/Install.md#set-up-the-poller'>'Setup the poller'</a>") . EOL ;
                $help .= EOL . EOL ;
                $tpl = get_markup_template('field_input.tpl');
                $help .= replace_macros($tpl, array(
@@ -390,6 +403,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 +434,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);*/
 }
@@ -481,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');