tinymce: add filebrowser for photos and attached files

[friendica.git] / mod / install.php

diff --git a/mod/install.php b/mod/install.php
index f7820fc80474680e6036874b587f93ec49883d6b..6f5552076c9594ad015e5d4b5934eb7a46c34214 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -186,8 +186,8 @@ function install_content(&$a) {
 
                        check_keys($checks);
                        
-                       if(x($_POST,'phppath'))
-                               $phpath = notags(trim($_POST['phppath']));
+                       if(x($_POST,'phpath'))
+                               $phpath = notags(trim($_POST['phpath']));
 
                        check_php($phpath, $checks);
 
@@ -210,6 +210,7 @@ function install_content(&$a) {
                                '$next' => t('Next'),
                                '$reload' => t('Check again'),
                                '$phpath' => $phpath,
+                               '$baseurl' => $a->get_baseurl(),
                        ));
                        return $o;
                }; break;
@@ -220,7 +221,7 @@ function install_content(&$a) {
                        $dbuser = notags(trim($_POST['dbuser']));
                        $dbpass = notags(trim($_POST['dbpass']));
                        $dbdata = notags(trim($_POST['dbdata']));
-                       $phpath = notags(trim($_POST['phppath']));
+                       $phpath = notags(trim($_POST['phpath']));
                        
 
                        $tpl = get_markup_template('install_db.tpl');
@@ -258,7 +259,7 @@ function install_content(&$a) {
                        $dbuser = notags(trim($_POST['dbuser']));
                        $dbpass = notags(trim($_POST['dbpass']));
                        $dbdata = notags(trim($_POST['dbdata']));
-                       $phpath = notags(trim($_POST['phppath']));
+                       $phpath = notags(trim($_POST['phpath']));
                        
                        $adminmail = notags(trim($_POST['adminmail']));
                        $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
@@ -322,7 +323,7 @@ function check_php(&$phpath, &$checks) {
                $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
                $tpl = get_markup_template('field_input.tpl');
                $help .= replace_macros($tpl, array(
-                       '$field' => array('phppath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
+                       '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
                ));
                $phpath="";
        }
@@ -339,7 +340,7 @@ function check_php(&$phpath, &$checks) {
                        $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.');
                }
-               check_add($checks, t('PHP "register_argc_argv"'), $passed, true, $help);
+               check_add($checks, t('PHP register_argc_argv'), $passed, true, $help);
        }
        
 
@@ -379,9 +380,9 @@ function check_funcs(&$checks) {
        
        if(function_exists('apache_get_modules')){
                if (! in_array('mod_rewrite',apache_get_modules())) {
-                       check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+                       check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
                } else {
-                       check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
+                       check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
                }
        }
        if(! function_exists('curl_init')){
@@ -450,7 +451,7 @@ function load_database_rem($v, $i){
 function load_database($db) {
 
        $str = file_get_contents('database.sql');
-       $str = array_reduce(explode("\n", $str),"load_database_rem","");
+//     $str = array_reduce(explode("\n", $str),"load_database_rem","");
        $arr = explode(';',$str);
        $errors = false;
        foreach($arr as $a) {
@@ -463,3 +464,6 @@ function load_database($db) {
        }
        return $errors;
 }
+
+
+