mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Fixes #660 - comments preferences had reverse behavior.

Browse Source
This commit is contained in:
Cameron
2015-02-06 11:26:22 -08:00
parent 9dc8ae14ab
commit 531047c134
3 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/comment.php
View File

@@ -97,7 +97,7 @@ class comments_admin_ui extends e_admin_ui
// optional, if $pluginName == 'core', core prefs will be used, else e107::getPluginConfig($pluginName); // optional, if $pluginName == 'core', core prefs will be used, else e107::getPluginConfig($pluginName);
protected $prefs = array( protected $prefs = array(
'comments_disabled' => array('title'=>PRFLAN_161, 'type'=>'boolean'), // TODO reverse this setting somehow? ie. 'Allow comments' instead of 'Disable comments' (Moc) 'comments_disabled' => array('title'=>PRFLAN_161, 'type'=>'boolean', 'writeParms'=>'inverse=1'), // Same as 'writeParms'=>'reverse=1&enabled=LAN_DISABLED&disabled=LAN_ENABLED'
'anon_post' => array('title'=>PRFLAN_32, 'type'=>'boolean'), 'anon_post' => array('title'=>PRFLAN_32, 'type'=>'boolean'),
'comments_icon' => array('title'=>PRFLAN_89, 'type'=>'boolean'), 'comments_icon' => array('title'=>PRFLAN_89, 'type'=>'boolean'),
'nested_comments' => array('title'=>PRFLAN_88, 'type'=>'boolean'), 'nested_comments' => array('title'=>PRFLAN_88, 'type'=>'boolean'),

2
e107_admin/newspost.php
View File

@@ -2477,7 +2477,7 @@ class admin_newspost
<tr> <tr>
<td>".NWSLAN_15.":</td> <td>".NWSLAN_15.":</td>
<td> <td>
".$frm->radio_switch('news_allow_comments', vartrue($_POST['news_allow_comments']))." ".$frm->radio_switch('news_allow_comments', vartrue($_POST['news_allow_comments']),null,null,'inverse=1')."
<div class='field-help'> <div class='field-help'>
".NWSLAN_18." ".NWSLAN_18."
</div> </div>

44
e107_handlers/form_handler.php
View File

@@ -1427,11 +1427,12 @@ class e_form
} }
/** /**
* @param name * Boolean Radio Buttons.
* @param check_enabled * @param name string
* @param label_enabled * @param check_enabled boolean
* @param label_disabled * @param label_enabled default is LAN_ENABLED
* @param options * @param label_disabled default is LAN_DISABLED
* @param options array - inverse=1 (invert values) or reverse=1 (switch display order)
*/ */
function radio_switch($name, $checked_enabled = false, $label_enabled = '', $label_disabled = '',$options=array()) function radio_switch($name, $checked_enabled = false, $label_enabled = '', $label_disabled = '',$options=array())
{ {
@@ -1449,32 +1450,23 @@ class e_form
$options_on['label'] = $label_enabled ? defset($label_enabled,$label_enabled) : LAN_ENABLED; $options_on['label'] = $label_enabled ? defset($label_enabled,$label_enabled) : LAN_ENABLED;
$options_off['label'] = $label_disabled ? defset($label_disabled,$label_disabled) : LAN_DISABLED; $options_off['label'] = $label_disabled ? defset($label_disabled,$label_disabled) : LAN_DISABLED;
if(vartrue($options['reverse'])) // reverse order. if(!empty($options['inverse'])) // Same as 'writeParms'=>'reverse=1&enabled=LAN_DISABLED&disabled=LAN_ENABLED'
{ {
unset($options['reverse']); $text = $this->radio($name, 0, !$checked_enabled, $options_on)." ".$this->radio($name, 1, $checked_enabled, $options_off);
return $this->radio($name, 0, !$checked_enabled, $options_off)." ".
$this->radio($name, 1, $checked_enabled, $options_on);
// return $this->radio($name, 0, !$checked_enabled, $options_off)."".$this->label($label_disabled ? $label_disabled : LAN_DISABLED, $name, 0)."&nbsp;&nbsp;".
// $this->radio($name, 1, $checked_enabled, $options_on)."".$this->label($label_enabled ? $label_enabled : LAN_ENABLED, $name, 1);
} }
elseif(!empty($options['reverse'])) // reverse display order.
{
$text = $this->radio($name, 0, !$checked_enabled, $options_off)." ".$this->radio($name, 1, $checked_enabled, $options_on);
}
else
{
// $helpLabel = (is_array($help)) ? vartrue($help[$value]) : $help; $text = $this->radio($name, 1, $checked_enabled, $options_on)." ".$this->radio($name, 0, !$checked_enabled, $options_off);
}
// Bootstrap Style Code - for use later.
// ['help'] = $helpLabel;
// $text[] = $this->radio($name, $value, (string) $checked === (string) $value, $options);
return $this->radio($name, 1, $checked_enabled, $options_on)." ".$this->radio($name, 0, !$checked_enabled, $options_off);
// return $this->radio($name, 1, $checked_enabled, $options_on)."".$this->label($label_enabled ? $label_enabled : LAN_ENABLED, $name, 1)."&nbsp;&nbsp;
// ".$this->radio($name, 0, !$checked_enabled, $options_off)."".$this->label($label_disabled ? $label_disabled : LAN_DISABLED, $name, 0);
return $text;
} }