mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

smartified configuration.inc.php

Browse Source
This commit is contained in:
onli 2012-03-03 13:22:40 +01:00
parent eb578a304f
commit 52d954ca6d
2 changed files with 51 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/admin/configuration.inc.php
View File

@ -18,13 +18,16 @@ if (!serendipity_checkPermission('siteConfiguration') && !serendipity_checkPermi
return;
}
$data = array();
switch ($_POST['installAction'] && serendipity_checkFormToken()) {
case 'check':
$data['installAction'] = 'check';
$oldConfig = $serendipity;
$res = serendipity_updateConfiguration();
$data['res'] = $res;
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 />';
$data['diagnosticError'] = true;
} else {
/* If we have new rewrite rules, then install them */
$permalinkOld = array(
@ -51,20 +54,13 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) {
}
}
if (serendipity_checkPermission('siteConfiguration') && serialize($permalinkOld) != serialize($permalinkNew)) {
printf(ATTEMPT_WRITE_FILE, $serendipity['serendipityPath'] . '.htaccess');
$data['htaccessRewrite'] = true;
$data['serendipityPath'] = $serendipity['serendipityPath'];
$res = serendipity_installFiles($serendipity['serendipityPath']);
if (is_array($res)) {
echo implode('<br />', $res);
} else {
echo DONE . '<br />';
}
$data['res'] = $res;
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;
@ -72,9 +68,21 @@ switch ($_POST['installAction'] && serendipity_checkFormToken()) {
default:
$from = &$serendipity;
$t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
ob_start();
serendipity_printConfigTemplate($t, $from, false, true);
$data['config'] = ob_get_contents();
ob_end_clean();
break;
}
if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init();
}
$serendipity['smarty']->assign($data);
$tfile = dirname(__FILE__) . "/tpl/configuration.inc.tpl";
$content = $serendipity['smarty']->fetch('file:'. $tfile);
echo $content;
/* vim: set sts=4 ts=4 expandtab : */
?>

31
include/admin/tpl/configuration.inc.tpl Normal file
View File

@ -0,0 +1,31 @@
{if $installAction == "check"}
{if $diagnosticError}
{$CONST.DIAGNOSTIC_ERROR}
<div class="serendipityAdminMsgError">-
<img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_error.png"}" alt="" />
{foreach $r in $res}
{$r} <br />
{/foreach}
</div>
<br />
<br />
{else}
{if $htaccessRewrite}
{$CONST.ATTEMPT_WRITE_FILE|sprintf:"{$serendipityPath}htaccess"}
{if is_array($res)}
{foreach $r in $res}
{$r} <br />
{/foreach}
{else}
{$CONST.DONE} <br />
{/if}
{/if}
<br />
<div class="serendipityAdminMsgSuccess">
<img style="height: 22px; width: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="{serendipity_getFile file="admin/img/admin_msg_success.png"}" alt="" />
{$CONST.WRITTEN_N_SAVED}
</div>
{/if}
{else}
{$config}
{/if}