that the baseURL is not overriden when configuring serendipity with a possibly autodetected currentl URL. Patch by Manko10.
81 lines
3.2 KiB
PHP
81 lines
3.2 KiB
PHP
<?php # $Id$
|
|
# Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
|
|
# All rights reserved. See LICENSE file for licensing details
|
|
|
|
if (IN_serendipity !== true) {
|
|
die ("Don't hack!");
|
|
}
|
|
|
|
umask(0000);
|
|
$umask = 0775;
|
|
@define('IN_installer', true);
|
|
|
|
if (!isset($_POST['installAction'])) {
|
|
$_POST['installAction'] = '';
|
|
}
|
|
|
|
if (!serendipity_checkPermission('siteConfiguration') && !serendipity_checkPermission('blogConfiguration')) {
|
|
return;
|
|
}
|
|
|
|
switch ($_POST['installAction'] && serendipity_checkFormToken()) {
|
|
case 'check':
|
|
$oldConfig = $serendipity;
|
|
$res = serendipity_updateConfiguration();
|
|
if (is_array($res)) {
|
|
echo DIAGNOSTIC_ERROR;
|
|
echo '<div class="serendipityAdminMsgError">- <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_error.png') . '" alt="" />' . implode('<br />', $res) . '</div><br /><br />';
|
|
} else {
|
|
/* If we have new rewrite rules, then install them */
|
|
$permalinkOld = array(
|
|
$oldConfig['serendipityHTTPPath'],
|
|
$oldConfig['serendipityPath'],
|
|
$oldConfig['defaultBaseURL'],
|
|
$oldConfig['indexFile'],
|
|
$oldConfig['rewrite']);
|
|
|
|
$permalinkNew = array(
|
|
$serendipity['serendipityHTTPPath'],
|
|
$serendipity['serendipityPath'],
|
|
$serendipity['defaultBaseURL'],
|
|
$serendipity['indexFile'],
|
|
$serendipity['rewrite']);
|
|
|
|
// Compare all old permalink section values against new one. A change in any of those
|
|
// will force to update the .htaccess for rewrite rules.
|
|
$permconf = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
|
|
if (is_array($permconf) && is_array($permconf['permalinks']['items'])) {
|
|
foreach($permconf['permalinks']['items'] AS $permitem) {
|
|
$permalinkOld[] = $oldConfig[$permitem['var']];
|
|
$permalinkNew[] = $serendipity[$permitem['var']];
|
|
}
|
|
}
|
|
|
|
|
|
if (serendipity_checkPermission('siteConfiguration') && serialize($permalinkOld) != serialize($permalinkNew)) {
|
|
printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
|
|
$res = serendipity_installFiles($serendipity['serendipityPath']);
|
|
if (is_array($res)) {
|
|
echo implode('<br />', $res);
|
|
} else {
|
|
echo DONE . '<br />';
|
|
}
|
|
|
|
serendipity_buildPermalinks();
|
|
}
|
|
|
|
echo '<br /><div class="serendipityAdminMsgSuccess"><img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="' . serendipity_getTemplateFile('admin/img/admin_msg_success.png') . '" alt="" />' . WRITTEN_N_SAVED .'</div>';
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
$from = &$serendipity;
|
|
$t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
|
|
serendipity_printConfigTemplate($t, $from, false, true);
|
|
break;
|
|
}
|
|
|
|
/* vim: set sts=4 ts=4 expandtab : */
|
|
?>
|