aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-03-21 17:34:29 -0700
committerFriendika <info@friendika.com>2011-03-21 17:34:29 -0700
commitf73e40c188a5baae6cad3e0884843be02df72a6c (patch)
treed9e4ffa0b0e65f151df8fc34ee0ce1290d6d31ab /mod
parentd71db3e0645a71cf65b095f9cf0dcfdd2b2b8980 (diff)
downloadvolse-hubzilla-f73e40c188a5baae6cad3e0884843be02df72a6c.tar.gz
volse-hubzilla-f73e40c188a5baae6cad3e0884843be02df72a6c.tar.bz2
volse-hubzilla-f73e40c188a5baae6cad3e0884843be02df72a6c.zip
several install issues sorted out
Diffstat (limited to 'mod')
-rw-r--r--mod/install.php62
1 files changed, 38 insertions, 24 deletions
diff --git a/mod/install.php b/mod/install.php
index dc91f848e..173df6d4b 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -14,17 +14,20 @@ function install_post(&$a) {
$phpath = notags(trim($_POST['phpath']));
require_once("dba.php");
-
+ unset ($db);
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
if(mysqli_connect_errno()) {
+ unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, '', true);
if(! mysqli_connect_errno()) {
$r = q("CREATE DATABASE '%s'",
dbesc($dbdata)
);
- if($r)
+ if($r) {
+ unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+ }
}
if(mysqli_connect_errno()) {
notice( t('Could not create/connect to database.') . EOL);
@@ -50,36 +53,47 @@ function install_post(&$a) {
}
$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();
-
- require_once('session.php');
- session_start();
- session_regenerate_id();
- $_SESSION['sysmsg'] = '';
+ if($errors)
+ $a->data['db_failed'] = true;
+ else
+ $a->data['db_installed'] = true;
- 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 );
- }
+ return;
}
function install_content(&$a) {
+ global $db;
$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);