X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finstall.php;h=dc91f848e6c74ea99f31b662ae7ee880a4a974ad;hb=8c245a5d2f4e6882211ac17561f86537a7089c73;hp=cb23b31ed5132a94748f4df9240a524b39118d56;hpb=35e29e10e69dfb086e990d852aa6b5006ce31d1b;p=friendica.git
diff --git a/mod/install.php b/mod/install.php
index cb23b31ed5..dc91f848e6 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -5,6 +5,7 @@ function install_post(&$a) {
global $db;
+ $urlpath = $a->get_path();
$dbhost = notags(trim($_POST['dbhost']));
$dbuser = notags(trim($_POST['dbuser']));
$dbpass = notags(trim($_POST['dbpass']));
@@ -14,22 +15,33 @@ function install_post(&$a) {
require_once("dba.php");
- $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, $true);
+ $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
- if(! $db->getdb()) {
- notice( t('Could not connect to database.') . EOL);
- return;
+ if(mysqli_connect_errno()) {
+ $db = new dba($dbhost, $dbuser, $dbpass, '', true);
+ if(! mysqli_connect_errno()) {
+ $r = q("CREATE DATABASE '%s'",
+ dbesc($dbdata)
+ );
+ if($r)
+ $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
+ }
+ if(mysqli_connect_errno()) {
+ notice( t('Could not create/connect to database.') . EOL);
+ return;
+ }
}
- else
- notice( t('Connected to database.') . EOL);
- $tpl = file_get_contents('view/htconfig.tpl');
+ notice( t('Connected to database.') . EOL);
+
+ $tpl = load_view_file('view/htconfig.tpl');
$txt = replace_macros($tpl,array(
'$dbhost' => $dbhost,
'$dbuser' => $dbuser,
'$dbpass' => $dbpass,
'$dbdata' => $dbdata,
'$timezone' => $timezone,
+ '$urlpath' => $urlpath,
'$phpath' => $phpath
));
$result = file_put_contents('.htconfig.php', $txt);
@@ -44,27 +56,35 @@ function install_post(&$a) {
// 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'] = '';
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());
+ . 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.') . EOL );
+ . t('Please see the file "INSTALL.txt".') . EOL );
}
}
function install_content(&$a) {
- notice( t('Welcome to the Mistpark Social Network.') . EOL);
+ $o = '';
+
+ notice( t('Welcome to Friendika.') . EOL);
+
+
+ check_funcs();
$o .= check_htconfig();
if(strlen($o))
@@ -77,10 +97,14 @@ function install_content(&$a) {
$o .= check_php($phpath);
+ $o .= check_keys();
+
+
require_once('datetime.php');
- $tpl = file_get_contents('view/install_db.tpl');
+ $tpl = load_view_file('view/install_db.tpl');
$o .= replace_macros($tpl, array(
+ '$baseurl' => $a->get_baseurl(),
'$tzselect' => ((x($_POST,'timezone')) ? select_timezone($_POST['timezone']) : select_timezone()),
'$submit' => t('Submit'),
'$dbhost' => ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost'),
@@ -94,44 +118,84 @@ function install_content(&$a) {
}
function check_php(&$phpath) {
+ $o = '';
$phpath = trim(shell_exec('which php'));
if(! strlen($phpath)) {
- $o .= <<< EOT
-Could not find a command line version of PHP in the web server PATH. This is required. Please adjust the configuration file .htconfig.php accordingly.
+ $o .= t('Could not find a command line version of PHP in the web server PATH.') . EOL;
+ $o .= t('This is required. Please adjust the configuration file .htconfig.php accordingly.') . EOL;
+ }
+ if(strlen($phpath)) {
+ $str = autoname(8);
+ $cmd = "$phpath testargs.php $str";
+ $result = trim(shell_exec($cmd));
+ if($result != $str) {
+ $o .= t('The command line version of PHP on your system does not have "register_argc_argv" enabled.') . EOL;
+ $o .= t('This is required for message delivery to work.') . EOL;
+ }
+ }
+ return $o;
+
+}
-EOT;
+function check_keys() {
+
+ $o = '';
+
+ $res = false;
+
+ if(function_exists('openssl_pkey_new'))
+ $res=openssl_pkey_new(array(
+ 'digest_alg' => 'sha1',
+ 'private_key_bits' => 4096,
+ 'encrypt_key' => false ));
+
+ // Get private key
+
+ 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;
+
}
-function check_htconfig() {
- if(((file_exists('.htconfig.php')) && (! is_writable('.htconfig.php')))
- || (! is_writable('.'))) {
+function check_funcs() {
+ if((function_exists('apache_get_modules')) && (! in_array('mod_rewrite',apache_get_modules())))
+ notice( t('Error: Apache webserver mod-rewrite module is required but not installed.') . EOL);
+ if(! function_exists('curl_init'))
+ notice( t('Error: libCURL PHP module required but not installed.') . EOL);
+ if(! function_exists('imagecreatefromjpeg'))
+ notice( t('Error: GD graphics PHP module with JPEG support required but not installed.') . EOL);
+ 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);
+ if((x($_SESSION,'sysmsg')) && strlen($_SESSION['sysmsg']))
+ notice( t('Please see the file "INSTALL.txt".') . EOL);
+}
-$o .= <<< EOT
-The web installer needs to be able to create a file called ".htconfig.php" in the top folder of
-your web server. It is unable to do so. 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).
+function check_htconfig() {
-Please check with your site documentation or support people to see if this situation can be corrected.
-If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.
+ if(((file_exists('.htconfig.php')) && (! is_writable('.htconfig.php')))
+ || (! is_writable('.'))) {
-EOT;
+ $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.txt" for instructions.');
}
-return $o;
+ return $o;
}
function manual_config(&$a) {
-$o .= <<< EOT
-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.
-
-
-EOT;
-return $o;
+ $data = htmlentities($a->data);
+ $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.');
+ $o .= "";
+ return $o;
}
@@ -148,6 +212,6 @@ function load_database($db) {
$errors ++;
}
}
- }
+ }
return $errors;
}
\ No newline at end of file