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

Work on $14 - user options ready, addUser work in progress;

Browse Source 
Form handler - introducing admin_trigger() alias
Various minor fixes
This commit is contained in:
SecretR
2012-12-10 17:17:51 +02:00
parent 6d914fb08c
commit 12bec41f6e
6 changed files with 248 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
e107_handlers/form_handler.php
View File

@@ -636,7 +636,7 @@ class e_form
<div class="e-autocomplete"></div>
</div>
';
// FIXME - switch to external JS, jQuery support
e107::getJs()->requireCoreLib('scriptaculous/controls.js', 2);
//TODO - external JS
e107::getJs()->footerInline("
@@ -716,6 +716,8 @@ class e_form
function password($name, $value = '', $maxlength = 50, $options = array())
{
if(is_string($options)) parse_str($options, $options);
if(vartrue($options['generate']))
{
$addon .= '&nbsp;<a href="#" class="smalltext" id="Spn_PasswordGenerator" >Generate</a> | <a class="smalltext" href="#" id="showPwd">Show</a><br />';
@@ -1139,6 +1141,15 @@ class e_form
return "<input class='e-tip S16 {$icon}' data-placement='left' type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
}
/**
* Alias of admin_button, adds the etrigger_ prefix required for UI triggers
* @see e_form::admin_button()
*/
function admin_trigger($name, $value, $action = 'submit', $label = '', $options = array())
{
return $this->admin_button('etrigger_'.$name, $value, $action, $label, $options);
}
/**
*
* @param string $name
@@ -2403,9 +2414,17 @@ class e_form
case 'bool':
case 'boolean':
$lenabled = vartrue($parms['enabled'], 'LAN_ENABLED');
$ldisabled = vartrue($parms['disabled'], 'LAN_DISABLED');
unset($parms['enabled'], $parms['disabled']);
if(varset($parms['label']) === 'yesno')
{
$lenabled = 'LAN_YES';
$ldisabled = 'LAN_NO';
}
else
{
$lenabled = vartrue($parms['enabled'], 'LAN_ENABLED');
$ldisabled = vartrue($parms['disabled'], 'LAN_DISABLED');
}
unset($parms['enabled'], $parms['disabled'], $parms['label']);
$ret = $this->radio_switch($key, $value, defset($lenabled, $lenabled), defset($ldisabled, $ldisabled),$parms);
break;