Merge branch 'develop' into rewrites/coding-convention-split2

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 382fcefd76a7564401fc16d3011fd10b0c9c9fa2..fbd296a9da565b5b09f45a1349ae2ee12dfa2af6 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -4,7 +4,7 @@ require_once "include/Photo.php";
 $install_wizard_pass=1;
 
 
-function install_init(App &$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") {
@@ -24,7 +24,7 @@ function install_init(App &$a){
 
 }
 
-function install_post(App &$a) {
+function install_post(App $a) {
        global $install_wizard_pass, $db;
 
        switch($install_wizard_pass) {
@@ -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);
@@ -132,7 +125,7 @@ function get_db_errno() {
        }
 }
 
-function install_content(App &$a) {
+function install_content(App $a) {
 
        global $install_wizard_pass, $db;
        $o = '';
@@ -261,7 +254,7 @@ function install_content(App &$a) {
 
                                '$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'),
+                               '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, t("For security reasons the password must not be empty"), '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'),
 
@@ -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);*/
 }
 
 
@@ -565,7 +538,7 @@ function check_imagik(&$checks) {
        }
 }
 
-function manual_config(App &$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>";