Removed commented code

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index 2339124469ef220c8373de7d48c7ada6a3b88524..d18d4ac3e29fba1048d431529bbbd9a8f95e439a 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -86,7 +86,7 @@ function install_post(&$a) {
                        $rino = 2;
                        if (! function_exists('mcrypt_create_iv')) {
                                $rino = 1;
-                       ]
+                       }
 
                        // connect to db
                        $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
@@ -285,7 +285,7 @@ function install_content(&$a) {
                        $adminmail = notags(trim($_POST['adminmail']));
                        $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
                        /* Installed langs */
-                       $lang_choices = get_avaiable_languages();
+                       $lang_choices = get_available_languages();
 
                        $tpl = get_markup_template('install_settings.tpl');
                        $o .= replace_macros($tpl, array(
@@ -417,7 +417,8 @@ function check_funcs(&$checks) {
        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, "");
 
        if(function_exists('apache_get_modules')){
                if (! in_array('mod_rewrite',apache_get_modules())) {
@@ -451,6 +452,10 @@ function check_funcs(&$checks) {
                $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.');
+       }
 
        $checks = array_merge($checks, $ck_funcs);
 
@@ -466,6 +471,13 @@ function check_funcs(&$checks) {
                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();
+       } catch (Exception $e) {
+               $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);*/