forked from GNUsocial/gnu-social
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
This commit is contained in:
commit
e9ac70bfa7
@ -108,7 +108,7 @@ function checkMirror($action_obj)
|
|||||||
function main()
|
function main()
|
||||||
{
|
{
|
||||||
// quick check for fancy URL auto-detection support in installer.
|
// quick check for fancy URL auto-detection support in installer.
|
||||||
if (isset($_SERVER['REDIRECT_URL']) && ((dirname($_SERVER['REQUEST_URI']) . '/check-fancy') === $_SERVER['REDIRECT_URL'])) {
|
if (isset($_SERVER['REDIRECT_URL']) && (preg_replace("/^\/$/","",(dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') === $_SERVER['REDIRECT_URL']) {
|
||||||
die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
|
die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
|
||||||
}
|
}
|
||||||
global $user, $action;
|
global $user, $action;
|
||||||
|
10
install.php
10
install.php
@ -77,7 +77,7 @@ function checkPrereqs()
|
|||||||
if (!is_writable($fileFullPath)) {
|
if (!is_writable($fileFullPath)) {
|
||||||
?><p class="error">Cannot write <?php echo $fileSubdir; ?> directory: <code><?php echo $fileFullPath; ?></code></p>
|
?><p class="error">Cannot write <?php echo $fileSubdir; ?> directory: <code><?php echo $fileFullPath; ?></code></p>
|
||||||
<p>On your server, try this command: <code>chmod a+w <?php echo $fileFullPath; ?></code></p>
|
<p>On your server, try this command: <code>chmod a+w <?php echo $fileFullPath; ?></code></p>
|
||||||
<?
|
<?php
|
||||||
$pass = false;
|
$pass = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -219,9 +219,9 @@ function handlePost()
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch($dbtype) {
|
switch($dbtype) {
|
||||||
case 'mysql': mysql_db_installer($host, $database, $username, $password, $sitename);
|
case 'mysql': mysql_db_installer($host, $database, $username, $password, $sitename, $fancy);
|
||||||
break;
|
break;
|
||||||
case 'pgsql': pgsql_db_installer($host, $database, $username, $password, $sitename);
|
case 'pgsql': pgsql_db_installer($host, $database, $username, $password, $sitename, $fancy);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
@ -232,7 +232,7 @@ function handlePost()
|
|||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
function pgsql_db_installer($host, $database, $username, $password, $sitename) {
|
function pgsql_db_installer($host, $database, $username, $password, $sitename, $fancy) {
|
||||||
$connstring = "dbname=$database host=$host user=$username";
|
$connstring = "dbname=$database host=$host user=$username";
|
||||||
|
|
||||||
//No password would mean trust authentication used.
|
//No password would mean trust authentication used.
|
||||||
@ -298,7 +298,7 @@ function pgsql_db_installer($host, $database, $username, $password, $sitename) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function mysql_db_installer($host, $database, $username, $password, $sitename) {
|
function mysql_db_installer($host, $database, $username, $password, $sitename, $fancy) {
|
||||||
updateStatus("Starting installation...");
|
updateStatus("Starting installation...");
|
||||||
updateStatus("Checking database...");
|
updateStatus("Checking database...");
|
||||||
|
|
||||||
|
@ -129,11 +129,6 @@ class Router
|
|||||||
$m->connect('index.php?action=' . $action, array('action' => $action));
|
$m->connect('index.php?action=' . $action, array('action' => $action));
|
||||||
}
|
}
|
||||||
|
|
||||||
$m->connect('main/:method',
|
|
||||||
array('action' => 'api',
|
|
||||||
'method' => 'oembed(.xml|.json)?',
|
|
||||||
'apiaction' => 'oembed'));
|
|
||||||
|
|
||||||
// settings
|
// settings
|
||||||
|
|
||||||
foreach (array('profile', 'avatar', 'password', 'openid', 'im',
|
foreach (array('profile', 'avatar', 'password', 'openid', 'im',
|
||||||
@ -480,6 +475,11 @@ class Router
|
|||||||
|
|
||||||
Event::handle('RouterInitialized', array($m));
|
Event::handle('RouterInitialized', array($m));
|
||||||
|
|
||||||
|
$m->connect('main/:method',
|
||||||
|
array('action' => 'api',
|
||||||
|
'method' => 'oembed(.xml|.json)?',
|
||||||
|
'apiaction' => 'oembed'));
|
||||||
|
|
||||||
return $m;
|
return $m;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user