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

Introduce Maintenance menu

Browse Source 
Containing all the small action menu-items that were in the main navigation menu, like verify installation
This commit is contained in:
onli 2014-01-19 13:19:30 +01:00
parent 7b5c123071
commit ee3ea72208
10 changed files with 114 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/admin/export.inc.php
View File

@ -1,14 +0,0 @@
<?php # $Id$
if (IN_serendipity !== true) {
die ("Don't hack!");
}
if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init();
}
echo serendipity_smarty_show('admin/export.inc.tpl');
/* vim: set sts=4 ts=4 expandtab : */

11
include/admin/images.inc.php
View File

@ -15,16 +15,7 @@ if (!is_object($serendipity['smarty'])) {
}
switch ($serendipity['GET']['adminAction']) {
case 'sync':
$data['case_sync'] = true;
$data['perm_adminImagesSync'] = true;
if (!serendipity_checkPermission('adminImagesSync')) {
$data['perm_adminImagesSync'] = false;
break;
}
break;
case 'doSync':
$data['case_doSync'] = true;
$data['perm_adminImagesSync'] = true;

28
include/admin/maintenance.inc.php Normal file
View File

@ -0,0 +1,28 @@
<?php
$data = array();
switch($serendipity['GET']['adminAction']) {
case 'integrity':
$data['action'] = "integrity";
if (!is_readable(S9Y_INCLUDE_PATH . 'checksums.inc.php') || 0 == filesize(S9Y_INCLUDE_PATH . 'checksums.inc.php') ) {
$data['noChecksum'] = true;
break;
}
$data['badsums'] = serendipity_verifyFTPChecksums();
break;
}
ob_start();
include S9Y_INCLUDE_PATH . 'include/admin/import.inc.php';
$data['importMenu'] = ob_get_contents();
ob_end_clean();
if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init();
}
echo serendipity_smarty_show('admin/maintenance.inc.tpl', $data);
/* vim: set sts=4 ts=4 expandtab : */

11
plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
View File

@ -15,7 +15,7 @@ class serendipity_event_entryproperties extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_ENTRYPROPERTIES_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '1.33.1');
$propbag->add('version', '1.32');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@ -32,7 +32,7 @@ class serendipity_event_entryproperties extends serendipity_event
'entries_header' => true,
'frontend_entryproperties' => true,
'backend_sidebar_entries_event_display_buildcache' => true,
'backend_sidebar_entries' => true,
'backend_maintenance' => true,
'backend_cache_entries' => true,
'backend_cache_purge' => true,
'backend_plugins_new_instance' => true,
@ -567,11 +567,10 @@ class serendipity_event_entryproperties extends serendipity_event
return true;
break;
case 'backend_sidebar_entries':
case 'backend_maintenance':
if ($is_cache && $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) {
?>
<li><a href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=buildcache"><?php echo PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE; ?></a></li>
<?php
echo '<section><h3>'. PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE .'</h3></section>';
echo '<a class="button_link" href="?serendipity[adminModule]=event_display&amp;serendipity[adminAction]=buildcache">'. PLUGIN_EVENT_ENTRYPROPERTY_BUILDCACHE .'</a>';
}
return true;
break;

35
serendipity_admin.php
View File

@ -20,6 +20,7 @@ if (IS_installed === false) {
if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout') {
serendipity_logout();
header("Location: ".$serendipity['baseURL']);
} else {
if (IS_installed === true) {
/* Check author token to insure session not hijacked */
@ -171,15 +172,6 @@ if (!$use_installer && $is_logged_in) {
$admin_section = PERSONAL_SETTINGS;
break;
case 'export':
if (!serendipity_checkPermission('adminImport')) {
break;
}
include S9Y_INCLUDE_PATH . 'include/admin/export.inc.php';
$admin_section = EXPORT_ENTRIES;
break;
case 'import':
if (!serendipity_checkPermission('adminImport')) {
break;
@ -227,28 +219,9 @@ if (!$use_installer && $is_logged_in) {
}
break;
case 'logout':
echo LOGGEDOUT;
break;
case 'integrity':
echo '<h2>' . INTEGRITY . '</h2>';
$badsums = array();
if (!is_readable(S9Y_INCLUDE_PATH . 'checksums.inc.php') || 0 == filesize(S9Y_INCLUDE_PATH . 'checksums.inc.php') ) {
echo '<span class="msg_notice"><span class="icon-info-circled"></span> ' . CHECKSUMS_NOT_FOUND . '</span>';
break;
}
$badsums = serendipity_verifyFTPChecksums();
if (count($badsums) == 0) {
echo '<span class="msg_success"><span class="icon-ok-circled"></span> ' . CHECKSUMS_PASS . '</span>';
} else {
echo '<ul class="plainList">';
foreach ($badsums as $rpath => $calcsum) {
echo '<li class="msg_error"><span class="icon-attention-circled"></span> ' . sprintf(CHECKSUM_FAILED, $rpath) . '</li>';
}
echo '</ul>';
}
$admin_section = INTEGRITY;
case 'maintenance':
include S9Y_INCLUDE_PATH . 'include/admin/maintenance.inc.php';
$admin_section = MAINTENANCE;
break;
default:

3
templates/2k11/admin/export.inc.tpl
View File

@ -1,3 +0,0 @@
<h2>{$CONST.EXPORT_ENTRIES}</h2>
<a class="button_link" href="{$serendipityBaseURL}rss.php?version=2.0&all=1"><span class="icon-rss"></span> {$CONST.EXPORT_FEED}</a>

36
templates/2k11/admin/images.inc.tpl
View File

@ -1,39 +1,3 @@
{if $case_sync}
<h2>{$CONST.CREATE_THUMBS}</h2>
{if !$perm_adminImagesSync}
<span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.PERM_DENIED}</span>
{else}
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.WARNING_THIS_BLAHBLAH|replace:'\\n':'<br>'}</span>
<form method="POST" action="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=doSync">
<fieldset>
<legend><span>{$CONST.SYNC_OPTION_LEGEND}</span></legend>
<div class="clearfix">
<div class="form_radio">
<input id="keepthumbs" name="serendipity[deleteThumbs]" type="radio" value="no" checked="checked">
<label for="keepthumbs">{$CONST.SYNC_OPTION_KEEPTHUMBS}</label>
</div>
<div class="form_radio">
<input id="sizecheckthumbs" name="serendipity[deleteThumbs]" type="radio" value="check">
<label for="sizecheckthumbs">{$CONST.SYNC_OPTION_SIZECHECKTHUMBS}</label>
</div>
<div class="form_radio">
<input id="deletethumbs" name="serendipity[deleteThumbs]" type="radio" value="yes">
<label for="deletethumbs">{$CONST.SYNC_OPTION_DELETETHUMBS}</label>
</div>
</div>
</fieldset>
<div class="form_buttons">
<a href="serendipity_admin.php" class="button_link state_cancel">{$CONST.ABORT_NOW}</a>
<input name="doSync" type="submit" value="{$CONST.CREATE_THUMBS}">
</div>
</form>
{/if}
{/if}
{if $case_doSync}
{if !$perm_adminImagesSync}
<span class="msg_error"><span class="icon-attention-circled"></span> {$CONST.PERM_DENIED}</span>

6
templates/2k11/admin/import.inc.tpl
View File

@ -31,12 +31,6 @@
{/if}
{/if}
{else}
<h2>{$CONST.IMPORT_WELCOME}</h2>
<p>{$CONST.IMPORT_WHAT_CAN}</p>
<h3>{$CONST.IMPORT_SELECT}:</h3>
<form action="" method="GET">
<input name="serendipity[adminModule]" type="hidden" value="import">
{$formToken}

11
templates/2k11/admin/index.tpl
View File

@ -112,9 +112,6 @@
{if 'adminImagesDirectories'|checkPermission}
<li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect">{$CONST.MANAGE_DIRECTORIES}</a></li>
{/if}
{if 'adminImagesSync'|checkPermission}
<li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync">{$CONST.CREATE_THUMBS}</a></li>
{/if}
{if $admin_vars.no_create !== true}
{serendipity_hookPlugin hook="backend_sidebar_entries_images" hookAll="true"}
{/if}
@ -151,13 +148,7 @@
{if 'adminUsersGroups'|checkPermission}
<li><a href="serendipity_admin.php?serendipity[adminModule]=groups">{$CONST.MANAGE_GROUPS}</a></li>
{/if}
{if 'adminImport'|checkPermission}
<li><a href="serendipity_admin.php?serendipity[adminModule]=import">{$CONST.IMPORT_ENTRIES}</a></li>
<li><a href="serendipity_admin.php?serendipity[adminModule]=export">{$CONST.EXPORT_ENTRIES}</a></li>
{/if}
{if 'siteConfiguration'|checkPermission || 'blogConfiguration'|checkPermission}
<li><a href="serendipity_admin.php?serendipity[adminModule]=integrity">{$CONST.INTEGRITY}</a></li>
{/if}
<li><a href="serendipity_admin.php?serendipity[adminModule]=maintenance">Maintenance</a></li> {* i18n *}
{if $admin_vars.no_create !== true}
{serendipity_hookPlugin hook="backend_sidebar_admin" hookAll="true"}
{/if}

75
templates/2k11/admin/maintenance.inc.tpl Normal file
View File

@ -0,0 +1,75 @@
<h2>Maintenance</h2> {* i18n *}
{if $action == "integrity"}
<h2>{$CONST.INTEGRITY}</h2>
{if $noChecksum == true}
<span class="msg_notice"><span class="icon-info-circled"></span>{$CONST.CHECKSUMS_NOT_FOUND}</span>
{else}
{if $badsums|count == 0}
<span class="msg_success"><span class="icon-ok-circled"></span>{$CONST.CHECKSUMS_PASS}</span>
{else}
<ul class="plainList">
{foreach $badsums as $rpath => $calcsum}
<li class="msg_error"><span class="icon-attention-circled"></span>{$CONST.CHECKSUM_FAILED|sprintf:$rpath}</li>
{/foreach}
</ul>
{/if}
{/if}
{/if}
{if 'siteConfiguration'|checkPermission || 'blogConfiguration'|checkPermission}
<section>
<h3>{$CONST.INTEGRITY}</h3>
<a class="button_link" href="?serendipity[action]=admin&amp;serendipity[adminModule]=maintenance&amp;serendipity[adminAction]=integrity" title="{$CONST.INTEGRITY}"><span>{$CONST.INTEGRITY}</span></a>
</section>
{/if}
{if 'adminImport'|checkPermission}
<section>
<h3>{$CONST.EXPORT_ENTRIES}</h3>
<a class="button_link" href="{$serendipityBaseURL}rss.php?version=2.0&all=1"><span class="icon-rss"></span> {$CONST.EXPORT_FEED}</a>
</section>
<section>
<h3>{$CONST.IMPORT_ENTRIES}</h3>
{$importMenu}
</section>
{/if}
{if 'adminImagesSync'|checkPermission}
<section>
<h3>{$CONST.CREATE_THUMBS}</h3>
<span class="msg_notice"><span class="icon-info-circled"></span> {$CONST.WARNING_THIS_BLAHBLAH|replace:'\\n':'<br>'}</span>
<form method="POST" action="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=doSync">
<fieldset>
<legend><span>{$CONST.SYNC_OPTION_LEGEND}</span></legend>
<div class="clearfix">
<div class="form_radio">
<input id="keepthumbs" name="serendipity[deleteThumbs]" type="radio" value="no" checked="checked">
<label for="keepthumbs">{$CONST.SYNC_OPTION_KEEPTHUMBS}</label>
</div>
<div class="form_radio">
<input id="sizecheckthumbs" name="serendipity[deleteThumbs]" type="radio" value="check">
<label for="sizecheckthumbs">{$CONST.SYNC_OPTION_SIZECHECKTHUMBS}</label>
</div>
<div class="form_radio">
<input id="deletethumbs" name="serendipity[deleteThumbs]" type="radio" value="yes">
<label for="deletethumbs">{$CONST.SYNC_OPTION_DELETETHUMBS}</label>
</div>
</div>
</fieldset>
<div class="form_buttons">
<input name="doSync" type="submit" value="{$CONST.CREATE_THUMBS}">
</div>
</form>
</section>
{/if}
{serendipity_hookPlugin hook="backend_maintenance" hookAll="true"}