'; @@ -140,7 +151,7 @@ function install_content(&$a) { $txt .= "
".$a->data['db_failed'] . "". EOL ; $db_return_text .= $txt; } - + if($db && $db->connected) { $r = q("SELECT COUNT(*) as `total` FROM `user`"); if($r && count($r) && $r[0]['total']) { @@ -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' => '', )); } @@ -157,7 +168,7 @@ function install_content(&$a) { if(x($a->data,'txt') && strlen($a->data['txt'])) { $db_return_text .= manual_config($a); } - + if ($db_return_text!="") { $tpl = get_markup_template('install.tpl'); return replace_macros($tpl, array( @@ -166,7 +177,7 @@ function install_content(&$a) { '$text' => $db_return_text . what_next(), )); } - + switch ($install_wizard_pass){ case 1: { // System check @@ -175,26 +186,28 @@ function install_content(&$a) { check_funcs($checks); + check_imagik($checks); + check_htconfig($checks); check_smarty3($checks); check_keys($checks); - + if(x($_POST,'phpath')) $phpath = notags(trim($_POST['phpath'])); check_php($phpath, $checks); check_htaccess($checks); - + function check_passed($v, $c){ if ($c['required']) $v = $v && $c['status']; return $v; } $checkspassed = array_reduce($checks, "check_passed", true); - + $tpl = get_markup_template('install_checks.tpl'); @@ -211,7 +224,7 @@ function install_content(&$a) { )); return $o; }; break; - + case 2: { // Database config $dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'); @@ -219,7 +232,7 @@ function install_content(&$a) { $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); $phpath = notags(trim($_POST['phpath'])); - + $tpl = get_markup_template('install_db.tpl'); $o .= replace_macros($tpl, array( @@ -230,23 +243,23 @@ function install_content(&$a) { '$info_03' => t('The database you specify below should already exist. If it does not, please create it before continuing.'), '$status' => $wizard_status, - - '$dbhost' => array('dbhost', t('Database Server Name'), $dbhost, ''), - '$dbuser' => array('dbuser', t('Database Login Name'), $dbuser, ''), - '$dbpass' => array('dbpass', t('Database Login Password'), $dbpass, ''), - '$dbdata' => array('dbdata', t('Database Name'), $dbdata, ''), - '$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.')), - + '$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'), + '$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'), + + '$lbl_10' => t('Please select a default timezone for your website'), - + '$baseurl' => $a->get_baseurl(), - + '$phpath' => $phpath, - + '$submit' => t('Submit'), - + )); return $o; }; break; @@ -257,38 +270,38 @@ function install_content(&$a) { $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); $phpath = notags(trim($_POST['phpath'])); - + $adminmail = notags(trim($_POST['adminmail'])); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); - + $tpl = get_markup_template('install_settings.tpl'); $o .= replace_macros($tpl, array( '$title' => $install_title, '$pass' => t('Site settings'), '$status' => $wizard_status, - - '$dbhost' => $dbhost, + + '$dbhost' => $dbhost, '$dbuser' => $dbuser, '$dbpass' => $dbpass, '$dbdata' => $dbdata, '$phpath' => $phpath, - - '$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.')), - + '$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'), + + '$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''), - + '$baseurl' => $a->get_baseurl(), - - - + + + '$submit' => t('Submit'), - + )); return $o; }; break; - + } } @@ -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 'Activating scheduled tasks'") . 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 'Setup the poller'") . EOL ; $help .= EOL . EOL ; $tpl = get_markup_template('field_input.tpl'); $help .= replace_macros($tpl, array( @@ -327,9 +340,9 @@ function check_php(&$phpath, &$checks) { )); $phpath=""; } - + check_add($checks, t('Command line PHP').($passed?" ($phpath)":""), $passed, false, $help); - + if($passed) { $cmd = "$phpath -v"; $result = trim(shell_exec($cmd)); @@ -342,8 +355,8 @@ function check_php(&$phpath, &$checks) { } check_add($checks, t('PHP cli binary'), $passed2, true, $help); } - - + + if($passed2) { $str = autoname(8); $cmd = "$phpath testargs.php $str"; @@ -356,7 +369,7 @@ function check_php(&$phpath, &$checks) { } check_add($checks, t('PHP register_argc_argv'), $passed3, true, $help); } - + } @@ -366,7 +379,7 @@ function check_keys(&$checks) { $res = false; - if(function_exists('openssl_pkey_new')) + if(function_exists('openssl_pkey_new')) $res=openssl_pkey_new(array( 'digest_alg' => 'sha1', 'private_key_bits' => 4096, @@ -390,8 +403,9 @@ 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')){ if (! in_array('mod_rewrite',apache_get_modules())) { check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.')); @@ -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);*/ } @@ -433,14 +464,14 @@ function check_htconfig(&$checks) { $help = ""; if( (file_exists('.htconfig.php') && !is_writable('.htconfig.php')) || (!file_exists('.htconfig.php') && !is_writable('.')) ) { - + $status=false; $help = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.') .EOL; $help .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.').EOL; $help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL; - $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; + $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; } - + check_add($checks, t('.htconfig.php is writable'), $status, false, $help); } @@ -449,14 +480,14 @@ function check_smarty3(&$checks) { $status = true; $help = ""; if( !is_writable('view/smarty3') ) { - + $status=false; $help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL; $help .= t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.').EOL; $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL; - $help .= t('Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.').EOL; + $help .= t('Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.').EOL; } - + check_add($checks, t('view/smarty3 is writable'), $status, true, $help); } @@ -466,19 +497,40 @@ function check_htaccess(&$checks) { $status = true; $help = ""; if (function_exists('curl_init')){ - $test = fetch_url($a->get_baseurl()."/install/testrewrite"); - if ($test!="ok") { - $status = false; - $help = t('Url rewrite in .htaccess is not working. Check your server configuration.'); - } - check_add($checks, t('Url rewrite is working'), $status, true, $help); - } else { - // cannot check modrewrite if libcurl is not installed - } - + $test = fetch_url($a->get_baseurl()."/install/testrewrite"); + + if ($test!="ok") + $test = fetch_url(normalise_link($a->get_baseurl()."/install/testrewrite")); + + if ($test!="ok") { + $status = false; + $help = t('Url rewrite in .htaccess is not working. Check your server configuration.'); + } + check_add($checks, t('Url rewrite is working'), $status, true, $help); + } else { + // cannot check modrewrite if libcurl is not installed + } } - +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'); $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.'); @@ -498,27 +550,31 @@ function load_database_rem($v, $i){ function load_database($db) { - $str = file_get_contents('database.sql'); + require_once("include/dbstructure.php"); + $errors = update_structure(false, true); + +/* $str = file_get_contents('database.sql'); $arr = explode(';',$str); $errors = false; foreach($arr as $a) { - if(strlen(trim($a))) { + if(strlen(trim($a))) { $r = @$db->q(trim($a)); if(false === $r) { $errors .= t('Errors encountered creating database tables.') . $a . EOL; } } - } + }*/ + return $errors; } function what_next() { $a = get_app(); $baseurl = $a->get_baseurl(); - return + return t('
".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') - .t('Please see the file "INSTALL.txt".') + .t('Please see the file "INSTALL.txt".') ."
" .t("Go to your new Friendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") ."
";