standards

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
old mode 100644 (file)
new mode 100755 (executable)
index 215c001..8854723
--- a/mod/install.php
+++ b/mod/install.php
@@ -43,12 +43,12 @@ function install_post(App $a) {
                        require_once("include/dba.php");
                        unset($db);
                        $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
-                       /*if (get_db_errno()) {
+                       /*if(get_db_errno()) {
                                unset($db);
                                $db = new dba($dbhost, $dbuser, $dbpass, '', true);
 
-                               if (! get_db_errno()) {
-                                       $r = q("CREATE DATABASE '%s'",
+                               if(! get_db_errno()) {
+                                       $r = q("CREATE DATABASE '%s' DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci",
                                                        dbesc($dbdata)
                                        );
                                        if ($r) {
@@ -78,14 +78,7 @@ function install_post(App $a) {
                        $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);
@@ -164,7 +157,7 @@ function install_content(App $a) {
                $db_return_text .= $txt;
        }
 
-       if ($db && $db->connected) {
+       if($db && $db->connected) {
                $r = q("SELECT COUNT(*) as `total` FROM `user`");
                if (dbm::is_result($r) && $r[0]['total']) {
                        $tpl = get_markup_template('install.tpl');
@@ -360,13 +353,13 @@ function check_php(&$phpath, &$checks) {
 
        check_add($checks, t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
 
-       if ($passed) {
+       if($passed) {
                $cmd = "$phpath -v";
                $result = trim(shell_exec($cmd));
                $passed2 = ( strpos($result, "(cli)") !== false );
                list($result) = explode("\n", $result);
                $help = "";
-               if (!$passed2) {
+               if(!$passed2) {
                        $help .= t('PHP executable is not the php cli binary (could be cgi-fgci version)'). EOL;
                        $help .= t('Found PHP version: ')."<tt>$result</tt>";
                }
@@ -380,7 +373,7 @@ function check_php(&$phpath, &$checks) {
                $result = trim(shell_exec($cmd));
                $passed3 = $result == $str;
                $help = "";
-               if (!$passed3) {
+               if(!$passed3) {
                        $help .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.'). EOL;
                        $help .= t('This is required for message delivery to work.');
                }
@@ -422,7 +415,6 @@ 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, "");
        check_add($ck_funcs, t('iconv module'), true, true, "");
 
@@ -454,10 +446,6 @@ 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.');
-       }
        if (! function_exists('iconv_strlen')){
                $ck_funcs[7]['status']= false;
                $ck_funcs[7]['help']= t('Error: iconv PHP module required but not installed.');
@@ -465,18 +453,6 @@ function check_funcs(&$checks) {
 
        $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();
@@ -484,9 +460,6 @@ function check_funcs(&$checks) {
                $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);*/
 }
 
 
@@ -589,10 +562,10 @@ function load_database($db) {
 /*     $str = file_get_contents('database.sql');
        $arr = explode(';',$str);
        $errors = false;
-       foreach ($arr as $a) {
-               if (strlen(trim($a))) {
+       foreach($arr as $a) {
+               if(strlen(trim($a))) {
                        $r = @$db->q(trim($a));
-                       if (false === $r) {
+                       if(false === $r) {
                                $errors .=  t('Errors encountered creating database tables.') . $a . EOL;
                        }
                }