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

More notice removal

Browse Source
This commit is contained in:
Tijn Kuyper
2012-12-08 13:52:05 +01:00
parent bb13386eb3
commit 5290bb8ea4
36 changed files with 134 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
e107_handlers/form_handler.php
View File

@@ -203,7 +203,7 @@ class e_form
$options['class'] = 'tbox input-text';
}
}
$options = $this->format_options('text', $name, $options);
//never allow id in format name-value for text fields
return "<input type='text' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />";
@@ -217,7 +217,7 @@ class e_form
if(!vartrue($parms['size'])) $parms['size'] = 15;
if(!vartrue($parms['class'])) $parms['class'] = 'tbox number e-spinner input-small';
if(!$value) $value = '0';
return $this->text($key, $value, $maxlength, $parms);
return $this->text(vartrue($key), $value, $maxlength, $parms);
}
function email($name, $value, $maxlength = 200, $options = array())
@@ -280,10 +280,10 @@ class e_form
parse_str($extras);
if($bbcode) $cat .= '&amp;bbcode=1';
if(vartrue($bbcode)) $cat .= '&amp;bbcode=1';
if(!$mode) $mode = 'main';
if(!$action) $action = 'dialog';
if(!vartrue($mode)) $mode = 'main';
if(!vartrue($action)) $action = 'dialog';
// $tabs // TODO - option to choose which tabs to display.
@@ -465,12 +465,12 @@ class e_form
}
//$width = intval(vartrue($sc_parameters['width'], 150));
$cat = $tp->toDB($sc_parameters['media']);
$cat = $tp->toDB(vartrue($sc_parameters['media']));
if($cat == '_icon')
{
$ret = "<div class='imgselector-container' style='display:block;width:64px;min-height:64px'>";
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $default_thumb;
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $default_thumb;
$style = ($blank) ? "border:1px dashed black;width:64px;height:64px" : "border:1px dashed black";
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='{$style}' />";
@@ -479,7 +479,7 @@ class e_form
{
$ret = "<div class='imgselector-container' style='display:block;width:120px;min-height:100px'>";
$att = 'aw=120&ah=100';
$thpath = isset($sc_parameters['nothumb']) || $hide ? $default : $tp->thumbUrl($default_thumb, $att, true);
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $tp->thumbUrl($default_thumb, $att, true);
$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='image-selector' style='width:120px;height:100px;border:1px dashed black;' />";
}
@@ -888,7 +888,7 @@ class e_form
$options_on = varset($options['enabled'],array());
$options_off = varset($options['disabled'],array());
if($options['class'] == 'e-expandit') // See admin->prefs 'Single Login' for an example.
if(vartrue($options['class']) == 'e-expandit') // See admin->prefs 'Single Login' for an example.
{
$options_on = array('class' => 'e-expandit-on');
$options_off = array('class' => 'e-expandit-off');
@@ -971,7 +971,7 @@ class e_form
$option_array = array(1 => LAN_YES, 0 => LAN_NO);
}
if($options['multiple'])
if(vartrue($options['multiple']))
{
$name = (strpos($name, '[') === false) ? $name.'[]' : $name;
$selected = explode(",",$selected);
@@ -1641,7 +1641,7 @@ class e_form
foreach ($fieldarray as $field => $data)
{
// shouldn't happen...
if(!isset($fieldvalues[$field]) && $data['alias'])
if(!isset($fieldvalues[$field]) && vartrue($data['alias']))
{
$fieldvalues[$data['alias']] = $fieldvalues[$data['field']];
$field = $data['alias'];
@@ -1652,7 +1652,7 @@ class e_form
{
continue;
}
elseif($data['type'] != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL)
elseif(vartrue($data['type']) != 'method' && !$data['forced'] && !isset($fieldvalues[$field]) && $fieldvalues[$field] !== NULL)
{
$ret .= "
<td>
@@ -1666,7 +1666,7 @@ class e_form
$tdclass = vartrue($data['class']);
if($field == 'checkboxes') $tdclass = $tdclass ? $tdclass.' autocheck e-pointer' : 'autocheck e-pointer';
// there is no other way for now - prepare user data
if('user' == $data['type']/* && isset($data['readParms']['idField'])*/)
if('user' == vartrue($data['type']) /* && isset($data['readParms']['idField'])*/)
{
if(is_string($data['readParms'])) parse_str($data['readParms'], $data['readParms']);
if(isset($data['readParms']['idField']))
@@ -1865,7 +1865,7 @@ class e_form
$opts = $wparms['__options'];
unset($wparms['__options']);
if($opts['multiple'] || $attributes['data']=='comma')
if(vartrue($opts['multiple']) || $attributes['data']=='comma')
{
$ret = array();
$value = is_array($value) ? $value : explode(',', $value);
@@ -2222,7 +2222,7 @@ class e_form
case 'textarea':
$text = "";
if($parms['append']) // similar to comments - TODO TBD. a 'comment' field type may be better.
if(vartrue($parms['append'])) // similar to comments - TODO TBD. a 'comment' field type may be better.
{
$attributes['readParms'] = 'bb=1';
$text = $this->renderValue($key, $value, $attributes).$this->hidden($key, $value).'<br />';
@@ -2351,7 +2351,7 @@ class e_form
$uc_options = vartrue($parms['classlist'], 'public,guest,nobody,member,admin,main,classes'); // defaults to 'public,guest,nobody,member,classes' (userclass handler)
unset($parms['classlist']);
$method = ($attributes['type'] == 'userclass') ? 'uc_select' : 'uc_select';
if($atrributes['type'] == 'userclasses'){ $parms['multiple'] = true; }
if(vartrue($atrributes['type']) == 'userclasses'){ $parms['multiple'] = true; }
$ret = $this->$method($key, $value, $uc_options, vartrue($parms, array()));
break;
@@ -2500,7 +2500,7 @@ class e_form
$asc = strtoupper(vartrue($options['asc'], 'asc'));
$elid = $fid;//$options['id'];
$query = isset($options['query']) ? $options['query'] : e_QUERY ;
if($_GET['action'] == 'list')
if(vartrue($_GET['action']) == 'list')
{
$query = e_QUERY; //XXX Quick fix for loss of pagination after 'delete'.
}
@@ -2692,7 +2692,7 @@ class e_form
foreach($fdata['fields'] as $key => $att)
{
// convert aliases - not supported in edit mod
if($att['alias'] && !$model->hasData($key))
if(vartrue($att['alias']) && !$model->hasData($key))
{
$key = $att['field'];
}
@@ -2715,7 +2715,7 @@ class e_form
}
// type null - system (special) fields
if($att['type'] !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
{
$required = '';
$required_class = '';
@@ -2749,7 +2749,7 @@ class e_form
$text .= "
<tr>
<td>
".$required."<span{$required_class}>".defset($att['title'], $att['title'])."</span>".$label."
".$required."<span{$required_class}>".defset(vartrue($att['title']), vartrue($att['title']))."</span>".$label."
</td>
<td>
".$this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()))."