X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=27cc6af840e654d10e6f1758120bd70876af415c;hb=cdf2fe859f439a9d3689ea946e23d9aef1fb6cac;hp=9043459b8625ac02ca9aeca6257167d687d00e29;hpb=2ef6ad80a4f7374e0488b8b10b8139e3392f81ff;p=friendica.git
diff --git a/mod/install.php b/mod/install.php
index 9043459b86..27cc6af840 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -12,19 +12,23 @@ function install_post(&$a) {
$dbdata = notags(trim($_POST['dbdata']));
$timezone = notags(trim($_POST['timezone']));
$phpath = notags(trim($_POST['phpath']));
+ $adminmail = notags(trim($_POST['adminmail']));
require_once("dba.php");
-
- $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, $true);
+ unset($db);
+ $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
if(mysqli_connect_errno()) {
+ unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, '', true);
- if(! mysql_connect_errno()) {
+ if(! mysqli_connect_errno()) {
$r = q("CREATE DATABASE '%s'",
dbesc($dbdata)
);
- if($r)
- $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, $true);
+ 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);
@@ -32,9 +36,9 @@ function install_post(&$a) {
}
}
- notice( t('Connected to database.') . EOL);
+ info( t('Connected to database.') . EOL);
- $tpl = load_view_file('view/htconfig.tpl');
+ $tpl = get_intltext_template('htconfig.tpl');
$txt = replace_macros($tpl,array(
'$dbhost' => $dbhost,
'$dbuser' => $dbuser,
@@ -42,46 +46,59 @@ function install_post(&$a) {
'$dbdata' => $dbdata,
'$timezone' => $timezone,
'$urlpath' => $urlpath,
- '$phpath' => $phpath
+ '$phpath' => $phpath,
+ '$adminmail' => $adminmail
));
+
$result = file_put_contents('.htconfig.php', $txt);
if(! $result) {
$a->data = $txt;
}
$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');
- 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.') . 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.') . EOL );
- }
+ return;
}
function install_content(&$a) {
+ global $db;
$o = '';
+
+ if(x($a->data,'db_installed')) {
+ $o .= '
' . t('Proceed with Installation') . '
';
+ $o .= '';
+ $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 .= '
';
+ $o .= '' . t('Proceed to registration') . '' ;
+ $o .= '
';
+ return $o;
+ }
- notice( t('Welcome to Friendika.') . EOL);
+ 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 '';
+ }
+ }
+
+ info( t('Welcome to Friendika.') . EOL);
check_funcs();
@@ -102,8 +119,19 @@ function install_content(&$a) {
require_once('datetime.php');
- $tpl = load_view_file('view/install_db.tpl');
+ $tpl = get_markup_template('install_db.tpl');
$o .= replace_macros($tpl, array(
+ '$lbl_01' => t('Friendika Social Network'),
+ '$lbl_02' => t('Installation'),
+ '$lbl_03' => t('In order to install Friendika we need to know how to connect to your database.'),
+ '$lbl_04' => t('Please contact your hosting provider or site administrator if you have questions about these settings.'),
+ '$lbl_05' => t('The database you specify below should already exist. If it does not, please create it before continuing.'),
+ '$lbl_06' => t('Database Server Name'),
+ '$lbl_07' => t('Database Login Name'),
+ '$lbl_08' => t('Database Login Password'),
+ '$lbl_09' => t('Database Name'),
+ '$lbl_10' => t('Please select a default timezone for your website'),
+ '$lbl_11' => t('Site administrator email address. Your account email address must match this in order to use the web admin panel.'),
'$baseurl' => $a->get_baseurl(),
'$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()),
'$submit' => t('Submit'),
@@ -111,7 +139,8 @@ function install_content(&$a) {
'$dbuser' => notags(trim($_POST['dbuser'])),
'$dbpass' => notags(trim($_POST['dbpass'])),
'$dbdata' => notags(trim($_POST['dbdata'])),
- '$phpath' => $phpath
+ '$phpath' => $phpath,
+ '$adminmail' => notags(trim($_POST['adminmail']))
));
return $o;
@@ -151,9 +180,10 @@ function check_keys() {
// Get private key
- if(! $res)
- $o .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
-
+ if(! $res) {
+ $o .= t('Error: the "openssl_pkey_new" function on this system is not able to generate encryption keys') . EOL;
+ $o .= t('If running under Windows, please see "http://www.php.net/manual/en/openssl.installation.php".') . EOL;
+ }
return $o;
}
@@ -169,9 +199,12 @@ function check_funcs() {
if(! function_exists('openssl_public_encrypt'))
notice( t('Error: openssl PHP module required but not installed.') . EOL);
if(! function_exists('mysqli_connect'))
- notice( t('Error: mysqli PHP module required but not installed.') . EOL);
+ notice( t('Error: mysqli PHP module required but not installed.') . EOL);
+ if(! function_exists('mb_strlen'))
+ notice( t('Error: mb_string PHP module required but not installed.') . EOL);
+
if((x($_SESSION,'sysmsg')) && strlen($_SESSION['sysmsg']))
- notice( t('Please see the file "INSTALL".') . EOL);
+ notice( t('Please see the file "INSTALL.txt".') . EOL);
}
@@ -183,7 +216,7 @@ function check_htconfig() {
$o = 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.');
$o .= 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.');
$o .= t('Please check with your site documentation or support people to see if this situation can be corrected.');
- $o .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.');
+ $o .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.');
}
return $o;
@@ -213,4 +246,4 @@ function load_database($db) {
}
}
return $errors;
-}
\ No newline at end of file
+}