clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug #232

This commit is contained in:
friendica 2011-12-03 00:08:04 -08:00
parent 09d8a3b69f
commit 172fdbcdcf
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1182' ); define ( 'FRIENDICA_VERSION', '2.3.1183' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1107 ); define ( 'DB_UPDATE_VERSION', 1107 );

20
mod/install.php
View File

@ -18,10 +18,10 @@ function install_post(&$a) {
unset($db); unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
if(mysqli_connect_errno()) { if(get_db_errno()) {
unset($db); unset($db);
$db = new dba($dbhost, $dbuser, $dbpass, '', true); $db = new dba($dbhost, $dbuser, $dbpass, '', true);
if(! mysqli_connect_errno()) { if(! get_db_errno()) {
$r = q("CREATE DATABASE '%s'", $r = q("CREATE DATABASE '%s'",
dbesc($dbdata) dbesc($dbdata)
); );
@ -30,7 +30,7 @@ function install_post(&$a) {
$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
} }
} }
if(mysqli_connect_errno()) { if(get_db_errno()) {
notice( t('Could not create/connect to database.') . EOL); notice( t('Could not create/connect to database.') . EOL);
return; return;
} }
@ -65,6 +65,12 @@ function install_post(&$a) {
return; return;
} }
function get_db_errno() {
if(class_exists('mysqli'))
return mysqli_connect_errno();
else
return mysql_errno();
}
function install_content(&$a) { function install_content(&$a) {
@ -74,7 +80,7 @@ function install_content(&$a) {
if(x($a->data,'db_installed')) { if(x($a->data,'db_installed')) {
$o .= '<h2>' . t('Proceed with Installation') . '</h2>'; $o .= '<h2>' . t('Proceed with Installation') . '</h2>';
$o .= '<p style="font-size: 130%;">'; $o .= '<p style="font-size: 130%;">';
$o .= t('Your Friendika site database has been installed.') . EOL; $o .= t('Your Friendica site database has been installed.') . EOL;
$o .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . 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 .= t('Please see the file "INSTALL.txt".') . EOL ;
$o .= '<br />'; $o .= '<br />';
@ -98,7 +104,7 @@ function install_content(&$a) {
} }
} }
info( t('Welcome to Friendika.') . EOL); info( t('Welcome to Friendica.') . EOL);
check_funcs(); check_funcs();
@ -121,9 +127,9 @@ function install_content(&$a) {
$tpl = get_markup_template('install_db.tpl'); $tpl = get_markup_template('install_db.tpl');
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$lbl_01' => t('Friendika Social Network'), '$lbl_01' => t('Friendica Social Communications Server'),
'$lbl_02' => t('Installation'), '$lbl_02' => t('Installation'),
'$lbl_03' => t('In order to install Friendika we need to know how to connect to your database.'), '$lbl_03' => t('In order to install Friendica 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_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_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_06' => t('Database Server Name'),