GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

most of code style errors gone 

Conflicts:

	install.php
This commit is contained in:
Brenda Wallace 2009-09-14 19:08:05 +12:00
parent 93605dce99
commit dbc08ef0a0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
install.php
View File

@ -516,8 +516,7 @@ STR;
}
global $dbModules;
$db = call_user_func($dbModules[$dbtype]['installer'],
$host, $database, $username, $password);
$db = call_user_func($dbModules[$dbtype]['installer'], $host, $database, $username, $password);
if (!$db) {
// database connection failed, do not move on to create config file.
@ -540,12 +539,10 @@ STR;
updateStatus("StatusNet has been installed at $link");
updateStatus("You can visit your <a href='$link'>new StatusNet site</a>.");
?>
<?php
}
function pgsql_db_installer($host, $database, $username, $password) {
function Pgsql_Db_installer($host, $database, $username, $password)
{
$connstring = "dbname=$database host=$host user=$username";
//No password would mean trust authentication used.
@ -605,7 +602,8 @@ function pgsql_db_installer($host, $database, $username, $password) {
return $db;
}
function mysql_db_installer($host, $database, $username, $password) {
function Mysql_Db_installer($host, $database, $username, $password)
{
updateStatus("Starting installation...");
updateStatus("Checking database...");
@ -678,9 +676,10 @@ function writeConf($sitename, $server, $path, $fancy, $db)
/**
* Install schema into the database
*
* @param filename $filename location of database schema file
* @param conn $conn connection to database
* @param type $type type of database, currently mysql or pgsql
* @param string $filename location of database schema file
* @param dbconn $conn connection to database
* @param string $type type of database, currently mysql or pgsql
*
* @return boolean - indicating success or failure
*/
function runDbScript($filename, $conn, $type = 'mysql')