Merge commit 'br3nda/0.8.x-pginstaller' into 0.8.x
This commit is contained in:
CiaranG
commit
6b7fa65ca1
@ -376,6 +376,20 @@ create table profile_block (
|
||||
|
||||
);
|
||||
|
||||
create sequence design_seq;
|
||||
create table design (
|
||||
id bigint default nextval('design_seq') /* comment 'design ID'*/,
|
||||
backgroundcolor integer /* comment 'main background color'*/ ,
|
||||
contentcolor integer /*comment 'content area background color'*/ ,
|
||||
sidebarcolor integer /*comment 'sidebar background color'*/ ,
|
||||
textcolor integer /*comment 'text color'*/ ,
|
||||
linkcolor integer /*comment 'link color'*/,
|
||||
backgroundimage varchar(255) /*comment 'background image, if any'*/,
|
||||
disposition int default 1 /*comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'*/,
|
||||
primary key (id)
|
||||
);
|
||||
|
||||
|
||||
create sequence user_group_seq;
|
||||
create table user_group (
|
||||
|
||||
@ -391,6 +405,8 @@ create table user_group (
|
||||
homepage_logo varchar(255) /* comment 'homepage (profile) size logo' */,
|
||||
stream_logo varchar(255) /* comment 'stream-sized logo' */,
|
||||
mini_logo varchar(255) /* comment 'mini logo' */,
|
||||
design_id integer /*comment 'id of a design' */ references design(id),
|
||||
|
||||
|
||||
created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,
|
||||
modified timestamp /* comment 'date this record was modified' */
|
||||
@ -487,19 +503,26 @@ create table file_to_post (
|
||||
unique(file_id, post_id)
|
||||
);
|
||||
|
||||
create sequence design_seq;
|
||||
create table design (
|
||||
id bigint default nextval('design_seq') /* comment 'design ID'*/,
|
||||
backgroundcolor integer /* comment 'main background color'*/ ,
|
||||
contentcolor integer /*comment 'content area background color'*/ ,
|
||||
sidebarcolor integer /*comment 'sidebar background color'*/ ,
|
||||
textcolor integer /*comment 'text color'*/ ,
|
||||
linkcolor integer /*comment 'link color'*/,
|
||||
backgroundimage varchar(255) /*comment 'background image, if any'*/,
|
||||
disposition int default 1 /*comment 'bit 1 = hide background image, bit 2 = display background image, bit 4 = tile background image'*/,
|
||||
primary key (id)
|
||||
create table group_block (
|
||||
group_id integer not null /* comment 'group profile is blocked from' */ references user_group (id),
|
||||
blocked integer not null /* comment 'profile that is blocked' */references profile (id),
|
||||
blocker integer not null /* comment 'user making the block'*/ references "user" (id),
|
||||
modified timestamp /* comment 'date of blocking'*/ ,
|
||||
|
||||
primary key (group_id, blocked)
|
||||
);
|
||||
|
||||
create table group_alias (
|
||||
|
||||
alias varchar(64) /* comment 'additional nickname for the group'*/ ,
|
||||
group_id integer not null /* comment 'group profile is blocked from'*/ references user_group (id),
|
||||
modified timestamp /* comment 'date alias was created'*/,
|
||||
primary key (alias)
|
||||
|
||||
);
|
||||
create index group_alias_group_id_idx on group_alias (group_id);
|
||||
|
||||
|
||||
/* Textsearch stuff */
|
||||
|
||||
create index textsearch_idx on profile using gist(textsearch);
|
||||
|
||||
113
install.php
113
install.php
@ -48,7 +48,7 @@ function checkPrereqs()
|
||||
$pass = false;
|
||||
}
|
||||
|
||||
$reqs = array('gd', 'mysql', 'curl',
|
||||
$reqs = array('gd', 'curl',
|
||||
'xmlwriter', 'mbstring',
|
||||
'gettext');
|
||||
|
||||
@ -58,6 +58,10 @@ function checkPrereqs()
|
||||
$pass = false;
|
||||
}
|
||||
}
|
||||
if (!checkExtension('pgsql') && !checkExtension('mysql')) {
|
||||
?><p class="error">Cannot find mysql or pgsql extension. You need one or the other: <code><?php echo $req; ?></code></p><?php
|
||||
$pass = false;
|
||||
}
|
||||
|
||||
if (!is_writable(INSTALLDIR)) {
|
||||
?><p class="error">Cannot write config file to: <code><?php echo INSTALLDIR; ?></code></p>
|
||||
@ -127,7 +131,15 @@ function showForm()
|
||||
<p class="form_guide">Database hostname</p>
|
||||
</li>
|
||||
<li>
|
||||
<label for="host">Database</label>
|
||||
|
||||
<label for="dbtype">Type</label>
|
||||
<input type="radio" name="dbtype" id="fancy-mysql" value="mysql" checked='checked' /> MySQL<br />
|
||||
<input type="radio" name="dbtype" id="dbtype-pgsql" value="pgsql" /> PostgreSQL<br />
|
||||
<p class="form_guide">Database type</p>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<label for="database">Name</label>
|
||||
<input type="text" id="database" name="database" />
|
||||
<p class="form_guide">Database name</p>
|
||||
</li>
|
||||
@ -139,7 +151,7 @@ function showForm()
|
||||
<li>
|
||||
<label for="password">Password</label>
|
||||
<input type="password" id="password" name="password" />
|
||||
<p class="form_guide">Database password</p>
|
||||
<p class="form_guide">Database password (optional)</p>
|
||||
</li>
|
||||
</ul>
|
||||
<input type="submit" name="submit" class="submit" value="Submit" />
|
||||
@ -163,6 +175,7 @@ function handlePost()
|
||||
|
||||
<?php
|
||||
$host = $_POST['host'];
|
||||
$dbtype = $_POST['dbtype'];
|
||||
$database = $_POST['database'];
|
||||
$username = $_POST['username'];
|
||||
$password = $_POST['password'];
|
||||
@ -191,10 +204,10 @@ function handlePost()
|
||||
$fail = true;
|
||||
}
|
||||
|
||||
if (empty($password)) {
|
||||
updateStatus("No password specified.", true);
|
||||
$fail = true;
|
||||
}
|
||||
// if (empty($password)) {
|
||||
// updateStatus("No password specified.", true);
|
||||
// $fail = true;
|
||||
// }
|
||||
|
||||
if (empty($sitename)) {
|
||||
updateStatus("No sitename specified.", true);
|
||||
@ -206,8 +219,76 @@ function handlePost()
|
||||
return;
|
||||
}
|
||||
|
||||
switch($dbtype) {
|
||||
case 'mysql': mysql_db_installer($host, $database, $username, $password, $sitename);
|
||||
break;
|
||||
case 'pgsql': pgsql_db_installer($host, $database, $username, $password, $sitename);
|
||||
break;
|
||||
default:
|
||||
}
|
||||
if ($path) $path .= '/';
|
||||
updateStatus("You can visit your <a href='/$path'>new Laconica site</a>.");
|
||||
?>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
||||
function pgsql_db_installer($host, $database, $username, $password, $sitename) {
|
||||
$connstring = "dbname=$database host=$host user=$username";
|
||||
|
||||
//No password would mean trust authentication used.
|
||||
if (!empty($password)) {
|
||||
$connstring .= " password=$password";
|
||||
}
|
||||
updateStatus("Starting installation...");
|
||||
updateStatus("Checking database...");
|
||||
$conn = pg_connect($connstring);
|
||||
|
||||
updateStatus("Running database script...");
|
||||
//wrap in transaction;
|
||||
pg_query($conn, 'BEGIN');
|
||||
$res = runDbScript(INSTALLDIR.'/db/laconica_pg.sql', $conn, 'pgsql');
|
||||
|
||||
if ($res === false) {
|
||||
updateStatus("Can't run database script.", true);
|
||||
showForm();
|
||||
return;
|
||||
}
|
||||
foreach (array('sms_carrier' => 'SMS carrier',
|
||||
'notice_source' => 'notice source',
|
||||
'foreign_services' => 'foreign service')
|
||||
as $scr => $name) {
|
||||
updateStatus(sprintf("Adding %s data to database...", $name));
|
||||
$res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql');
|
||||
if ($res === false) {
|
||||
updateStatus(sprintf("Can't run %d script.", $name), true);
|
||||
showForm();
|
||||
return;
|
||||
}
|
||||
}
|
||||
pg_query($conn, 'COMMIT');
|
||||
|
||||
updateStatus("Writing config file...");
|
||||
if (empty($password)) {
|
||||
$sqlUrl = "pgsql://$username@$host/$database";
|
||||
}
|
||||
else {
|
||||
$sqlUrl = "pgsql://$username:$password@$host/$database";
|
||||
}
|
||||
$res = writeConf($sitename, $sqlUrl, $fancy, 'pgsql');
|
||||
if (!$res) {
|
||||
updateStatus("Can't write config file.", true);
|
||||
showForm();
|
||||
return;
|
||||
}
|
||||
updateStatus("Done!");
|
||||
|
||||
}
|
||||
|
||||
function mysql_db_installer($host, $database, $username, $password, $sitename) {
|
||||
updateStatus("Starting installation...");
|
||||
updateStatus("Checking database...");
|
||||
|
||||
$conn = mysql_connect($host, $username, $password);
|
||||
if (!$conn) {
|
||||
updateStatus("Can't connect to server '$host' as '$username'.", true);
|
||||
@ -240,6 +321,7 @@ function handlePost()
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
updateStatus("Writing config file...");
|
||||
$sqlUrl = "mysqli://$username:$password@$host/$database";
|
||||
$res = writeConf($sitename, $sqlUrl, $fancy);
|
||||
@ -249,14 +331,8 @@ function handlePost()
|
||||
return;
|
||||
}
|
||||
updateStatus("Done!");
|
||||
if ($path) $path .= '/';
|
||||
updateStatus("You can visit your <a href='/$path'>new Laconica site</a>.");
|
||||
?>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
||||
function writeConf($sitename, $sqlUrl, $fancy)
|
||||
function writeConf($sitename, $sqlUrl, $fancy, $type='mysql')
|
||||
{
|
||||
$res = file_put_contents(INSTALLDIR.'/config.php',
|
||||
"<?php\n".
|
||||
@ -264,11 +340,13 @@ function writeConf($sitename, $sqlUrl, $fancy)
|
||||
"\$config['site']['name'] = \"$sitename\";\n\n".
|
||||
($fancy ? "\$config['site']['fancy'] = true;\n\n":'').
|
||||
"\$config['db']['database'] = \"$sqlUrl\";\n\n".
|
||||
($type == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n" .
|
||||
"\$config['db']['type'] = \"$type\";\n\n" : '').
|
||||
"?>");
|
||||
return $res;
|
||||
}
|
||||
|
||||
function runDbScript($filename, $conn)
|
||||
function runDbScript($filename, $conn, $type='mysql')
|
||||
{
|
||||
$sql = trim(file_get_contents($filename));
|
||||
$stmts = explode(';', $sql);
|
||||
@ -277,8 +355,13 @@ function runDbScript($filename, $conn)
|
||||
if (!mb_strlen($stmt)) {
|
||||
continue;
|
||||
}
|
||||
if ($type == 'mysql') {
|
||||
$res = mysql_query($stmt, $conn);
|
||||
} elseif ($type=='pgsql') {
|
||||
$res = pg_query($conn, $stmt);
|
||||
}
|
||||
if ($res === false) {
|
||||
updateStatus("FAILED SQL: $stmt");
|
||||
return $res;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user