iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 2558 fixed: instead of locking the gallery with a simple checkbox among

Browse Source 
configuration options, "lock gallery" becomes a maintenance action, with a
confirmation on popup.


git-svn-id: http://piwigo.org/svn/trunk@13001 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2012-01-31 00:33:01 +00:00
parent 907c8e2104
commit 7c322f6d9c
6 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin/configuration.php
View File

@@ -46,7 +46,6 @@ else
}
$main_checkboxes = array(
'gallery_locked',
'allow_user_registration',
'obligatory_user_mail_address',
'rate',
@@ -172,16 +171,6 @@ if (isset($_POST['submit']))
}
}
if (empty($_POST['gallery_locked']) and $conf['gallery_locked'])
{
$tpl_var = & $template->get_template_vars('header_msgs');
$msg_key = array_search(l10n('The gallery is locked for maintenance. Please, come back later.'), $tpl_var);
unset($tpl_var[$msg_key]);
}
elseif (!empty($_POST['gallery_locked']) and !$conf['gallery_locked'])
{
$template->append('header_msgs', l10n('The gallery is locked for maintenance. Please, come back later.'));
}
foreach( $main_checkboxes as $checkbox)
{
$_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';

30
admin/maintenance.php
View File

@@ -47,6 +47,19 @@ $action = isset($_GET['action']) ? $_GET['action'] : '';
switch ($action)
{
case 'lock_gallery' :
{
conf_update_param('gallery_locked', 'true');
redirect(get_root_url().'admin.php?page=maintenance');
break;
}
case 'unlock_gallery' :
{
conf_update_param('gallery_locked', 'false');
$_SESSION['page_infos'] = array(l10n('Gallery unlocked'));
redirect(get_root_url().'admin.php?page=maintenance');
break;
}
case 'categories' :
{
update_uppercats();
@@ -164,6 +177,23 @@ $template->assign(
)
);
if ($conf['gallery_locked'])
{
$template->assign(
array(
'U_MAINT_UNLOCK_GALLERY' => sprintf($url_format, 'unlock_gallery'),
)
);
}
else
{
$template->assign(
array(
'U_MAINT_LOCK_GALLERY' => sprintf($url_format, 'lock_gallery'),
)
);
}
// +-----------------------------------------------------------------------+
// | Define advanced features |
// +-----------------------------------------------------------------------+

7
admin/themes/default/template/configuration.tpl
View File

@@ -32,13 +32,6 @@
<fieldset id="mainConfCheck">
<legend></legend>
<ul>
<li>
<label>
<span class="property">{'Lock gallery'|@translate}</span>
<input type="checkbox" name="gallery_locked" {if ($main.gallery_locked)}checked="checked"{/if}>
</label>
</li>
<li>
<label>
<span class="property">{'Allow rating'|@translate}</span>

13
admin/themes/default/template/maintenance.tpl
View File

@@ -3,13 +3,17 @@
</div>
<ul>
{foreach from=$advanced_features item=feature}
<li><a href="{$feature.URL}">{$feature.CAPTION}</a></li>
{/foreach}
{if (isset($U_MAINT_LOCK_GALLERY))}
<li><a href="{$U_MAINT_LOCK_GALLERY}" onclick="return confirm('{'A locked gallery is only visible to administrators'|@translate|@escape:'javascript'}');">{'Lock gallery'|@translate}</a></li>
{else}
<li><a href="{$U_MAINT_UNLOCK_GALLERY}">{'Unlock gallery'|@translate}</a></li>
{/if}
</ul>
<ul>
<li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li>
{foreach from=$advanced_features item=feature}
<li><a href="{$feature.URL}">{$feature.CAPTION}</a></li>
{/foreach}
</ul>
<ul>
@@ -23,6 +27,7 @@
</ul>
<ul>
<li><a href="{$U_MAINT_ORPHAN_TAGS}">{'Delete orphan tags'|@translate}</a></li>
<li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate|@escape:'javascript'}');">{'Purge history detail'|@translate}</a></li>
<li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate|@escape:'javascript'}');">{'Purge history summary'|@translate}</a></li>
<li><a href="{$U_MAINT_SESSIONS}">{'Purge sessions'|@translate}</a></li>

3
language/en_UK/admin.lang.php
View File

@@ -832,4 +832,7 @@ $lang['[NBM] Problems or questions'] = "[NBM] Problems or questions";
$lang['Resize after upload'] = 'Resize after upload';
$lang['Photo Sizes'] = 'Photo Sizes';
$lang['Original Size'] = 'Original Size';
$lang['A locked gallery is only visible to administrators'] = 'A locked gallery is only visible to administrators';
$lang['Unlock gallery'] = 'Unlock gallery';
$lang['Gallery unlocked'] = 'Gallery unlocked';
?>

4
language/fr_FR/admin.lang.php
View File

@@ -845,5 +845,7 @@ $lang['Original Size'] = 'Taille originale';
$lang['Send connection settings by email'] = 'Envoyer les identifiants par email';
$lang['Activate comments'] = 'Activer les commentaires';
$lang['Default comments order'] = 'Ordre par défaut des commentaires';
$lang['A locked gallery is only visible to administrators'] = 'Une galerie verrouillée n\'est visible que des administrateurs';
$lang['Unlock gallery'] = 'Déverouiller la galerie';
$lang['Gallery unlocked'] = 'Galerie déverouillée';
?>