MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

several install issues sorted out

Browse source
This commit is contained in:
Friendika 2011-03-21 17:34:29 -07:00
parent d71db3e064
commit f73e40c188
1 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
mod/install.php
View file

@ -14,18 +14,21 @@ function install_post(&$a) {
$phpath = notags(trim($_POST['phpath'])); $phpath = notags(trim($_POST['phpath']));
require_once("dba.php"); require_once("dba.php");
unset ($db);
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
if(mysqli_connect_errno()) { if(mysqli_connect_errno()) {
unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, '', true); $db = new dba($dbhost, $dbuser, $dbpass, '', true);
if(! mysqli_connect_errno()) { if(! mysqli_connect_errno()) {
$r = q("CREATE DATABASE '%s'", $r = q("CREATE DATABASE '%s'",
dbesc($dbdata) dbesc($dbdata)
); );
if($r) if($r) {
unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
} }
}
if(mysqli_connect_errno()) { if(mysqli_connect_errno()) {
notice( t('Could not create/connect to database.') . EOL); notice( t('Could not create/connect to database.') . EOL);
return; return;
@ -50,37 +53,48 @@ function install_post(&$a) {
} }
$errors = load_database($db); $errors = load_database($db);
if(! $errors) {
// Our sessions normally are stored in the database. But as we have only managed
// to get it bootstrapped milliseconds ago, we have to apply a bit of trickery so
// that you'll see the following important notice (which is stored in the session).
session_write_close(); if($errors)
$a->data['db_failed'] = true;
else
$a->data['db_installed'] = true;
require_once('session.php'); return;
session_start();
session_regenerate_id();
$_SESSION['sysmsg'] = '';
notice( t('Database import succeeded.') . EOL
. t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL
. t('Please see the file "INSTALL.txt".') . EOL );
goaway($a->get_baseurl() . '/register' );
}
else {
$db = null; // start fresh
notice( t('Database import failed.') . EOL
. t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL
. t('Please see the file "INSTALL.txt".') . EOL );
}
} }
function install_content(&$a) { function install_content(&$a) {
global $db;
$o = ''; $o = '';
if(x($a->data,'db_installed')) {
$o .= '<h2>' . t('Proceed with Installation') . '</h2>';
$o .= '<p style="font-size: 130%;">';
$o .= t('Your Friendika site database has been installed.') . EOL;
$o .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL ;
$o .= t('Please see the file "INSTALL.txt".') . EOL ;
$o .= '<br />';
$o .= '<a href="' . $a->get_baseurl() . '/register' . '">' . t('Proceed to registration') . '</a>' ;
$o .= '</p>';
return $o;
}
if(x($a->data,'db_failed')) {
$o .= t('Database import failed.') . EOL;
$o .= t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
$o .= t('Please see the file "INSTALL.txt".') . EOL ;
return $o;
}
if($db && $db->connected) {
$r = q("SELECT COUNT(*) as `total` FROM `user`");
if($r && count($r) && $r[0]['total']) {
notice( t('Permission denied.') . EOL);
return '';
}
}
notice( t('Welcome to Friendika.') . EOL); notice( t('Welcome to Friendika.') . EOL);