reverting commit ece1130

This commit is contained in:
Claude 2014-11-17 12:09:31 +01:00
parent 5e1a6ab9bc
commit c9bb1cadee
6 changed files with 43 additions and 61 deletions

View File

@ -132,7 +132,6 @@ $config['disable_api'] = false;
$config['disable_keep_forever'] = false;
$config['blocked_words'] = '';
$config['disable_shorturl'] = false;
$config['remove_shorturl_checkbox'] = false;
$config['disallow_search_engines'] = false;
//spamadmin: accessible via /spamadmin (only active when user + pass is set)

View File

@ -75,17 +75,14 @@
<div class="controls">
<label class="checkbox">
<?php
if ($this->config->item('remove_shorturl_checkbox') == false)
{
$set = array('name' => 'snipurl', 'id' => 'snipurl', 'value' => '1', 'tabindex' => '5', 'checked' => $snipurl_set);
if ($this->config->item('disable_shorturl')){
$set['checked'] = 0;
$set = array('name' => 'private', 'id' => 'private', 'tabindex' => '6', 'value' => '1', 'checked' => $private_set);
if ($this->config->item('private_only')){
$set['checked'] = 1;
$set['disabled'] = 'disabled';
}
echo form_checkbox($set);
echo lang('paste_create_shorturl') . ' - ' . lang('paste_shorturl_desc');
} ?>
?>
<?php echo lang('paste_private') . ' - ' . lang('paste_private_desc'); ?>
</label>
</div>
</div>

View File

@ -68,9 +68,6 @@
<div class="item_group">
<div class="item">
<?php if ($this->config->item('remove_shorturl_checkbox') == false)
{
?>
<label for="snipurl"><?php echo lang('paste_create_shorturl'); ?>
<span class="instruction"><?php echo lang('paste_shorturl_desc'); ?></span>
</label>
@ -84,7 +81,6 @@
echo form_checkbox($set);
?>
</div>
<?php } ?>
</div>
<div class="item">

View File

@ -53,9 +53,6 @@
<div class="item_group">
<div class="item">
<?php if ($this->config->item('remove_shorturl_checkbox') == false)
{
?>
<label for="snipurl"><?php echo lang('paste_create_shorturl'); ?>
<span class="instruction"><?php echo lang('paste_shorturl_desc'); ?></span>
</label>
@ -69,7 +66,6 @@
echo form_checkbox($set);
?>
</div>
<?php } ?>
</div>
<div class="item">

View File

@ -60,17 +60,14 @@
<div class="controls">
<label class="checkbox">
<?php
if ($this->config->item('remove_shorturl_checkbox') == false)
{
$set = array('name' => 'snipurl', 'id' => 'snipurl', 'value' => '1', 'tabindex' => '5', 'checked' => $snipurl_set);
if ($this->config->item('disable_shorturl')){
$set['checked'] = 0;
$set['disabled'] = 'disabled';
}
echo form_checkbox($set);
echo lang('paste_create_shorturl') . ' - ' . lang('paste_shorturl_desc');
} ?>
?>
<?php echo lang('paste_create_shorturl') . ' - ' . lang('paste_shorturl_desc'); ?>
</label>
</div>
</div>

View File

@ -74,17 +74,14 @@
<div class="controls">
<label class="checkbox">
<?php
if ($this->config->item('remove_shorturl_checkbox') == false)
{
$set = array('name' => 'snipurl', 'id' => 'snipurl', 'value' => '1', 'tabindex' => '5', 'checked' => $snipurl_set);
if ($this->config->item('disable_shorturl')){
$set['checked'] = 0;
$set = array('name' => 'private', 'id' => 'private', 'tabindex' => '6', 'value' => '1', 'checked' => $private_set);
if ($this->config->item('private_only')){
$set['checked'] = 1;
$set['disabled'] = 'disabled';
}
echo form_checkbox($set);
echo lang('paste_create_shorturl') . ' - ' . lang('paste_shorturl_desc');
} ?>
?>
<?php echo lang('paste_private') . ' - ' . lang('paste_private_desc'); ?>
</label>
</div>
</div>