extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

- new validator for selectboxes (menupopup)

Browse Source 
- also used currently to supply options for predefined selectboxes (eg. select-cat), need to discuss if we want to fetch these per ajax
- new widget method run, which runs a given method on all widgets (and children) supporting it, eg. used now for validate
This commit is contained in:
Ralf Becker 2011-08-20 10:27:38 +00:00
parent fcff01e3cc
commit e92087df31
6 changed files with 669 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/inc/class.etemplate_new.inc.php
View File

@ -16,7 +16,7 @@ if (!isset($GLOBALS['egw_info']))
{
$GLOBALS['egw_info'] = array(
'flags' => array(
'currentapp' => 'login',
'currentapp' => $_REQUEST['sessionid'] ? 'etemplate' : 'login',
'nonavbar' => true,
'debug' => 'etemplate_new',
)
@ -113,11 +113,16 @@ class etemplate_new extends etemplate_widget_template
if (self::$request->output_mode == -1) self::$request->output_mode = 0;
self::$request->template = $this->as_array();
// instanciate template to fill self::$request->sel_options for select-* widgets
// not sure if we want to handle it this way, thought otherwise we will have a few ajax request for each dialog fetching predefined selectboxes
$template = etemplate_widget_template::instance($this->name, $this->template_set, $this->version, $this->laod_via);
$template->run('fillTypeOptions');
$data = array(
'etemplate_exec_id' => self::$request->id(),
'app_header' => $GLOBALS['egw_info']['flags']['app_header'],
'content' => $content,
'sel_options' => $sel_options,
'sel_options' => self::$request->sel_options,
'readonlys' => $readonlys,
'modifications' => $this->modifications,
'validation_errors' => self::$validation_errors,
@ -170,7 +175,7 @@ class etemplate_new extends etemplate_widget_template
throw new egw_exception_wrong_parameter('Can NOT read template '.array2string(self::$request->template));
}
$validated = array();
$template->validate($content, $validated);
$template->run('validate', array('', $content, &$validated));
if (self::validation_errors(self::$request->ignore_validation))
{
error_log(__METHOD__."(,".array2string($content).') validation_errors='.array2string(self::$validation_errors));

40
etemplate/inc/class.etemplate_widget.inc.php
View File

@ -263,6 +263,8 @@ class etemplate_widget
$class_name = 'etemplate_widget';
}
}
//error_log(__METHOD__."('$type', ..., '$id') using $class_name");
// currently only overlays can contain templates, other widgets can only reference to templates via id
if ($type == 'template' && $id && ($template = etemplate_widget_template::instance($id)))
{
@ -296,23 +298,23 @@ class etemplate_widget
}
/**
* Validate input
* Run a given method on all children
*
* Default implementation only calls validate on it's children
* Default implementation only calls method on itself and run on all children
*
* @param array $content
* @param array &$validated=array() validated content
* @param string $cname='' current namespace
* @return boolean true if no validation error, false otherwise
* @param string $method_name
* @param array $params=array('') parameter(s) first parameter has to be the cname!
*/
public function validate(array $content, &$validated=array(), $cname = '')
public function run($method_name, $params=array(''))
{
$ok = true;
if (method_exists($this, $method_name))
{
call_user_func_array(array($this, $method_name), $params);
}
foreach($this->children as $child)
{
$ok = $child->validate($content, $validated, $cname) && $ok;
$child->run($method_name, $params);
}
return $ok;
}
/**
@ -435,8 +437,7 @@ class etemplate_widget
$readonly = $this->attrs['readonly'] || self::$request->readonlys[$form_name] ||
isset(self::$request->readonlys['__ALL__']) && self::$request->readonlys[$form_name] !== false;
error_log(__METHOD__."('$cname') this->id='$this->id' --> form_name='$form_name' returning ".array2string($readonly));
//error_log(__METHOD__."('$cname') this->id='$this->id' --> form_name='$form_name' returning ".array2string($readonly));
return $readonly;
}
/**
@ -523,20 +524,19 @@ class etemplate_widget_named extends etemplate_widget
);
/**
* Validate input
* Run a given method on all children
*
* Reimplemented because grids can have an own namespace
* Reimplemented because grids and boxes can have an own namespace
*
* @param array $content
* @param array &$validated=array() validated content
* @param string $cname='' current namespace
* @return boolean true if no validation error, false otherwise
* @param string $method_name
* @param array $params=array('') parameter(s) first parameter has to be cname!
*/
public function validate(array $content, &$validated=array(), $cname = '')
public function run($method_name, $params=array(''))
{
$cname =& $params[0];
if ($this->id) $cname = self::form_name($cname, $this->id);
return parent::validate($content, $validated, $cname);
parent::run($method_name, $params);
}
}
// register class for layout widgets, which can have an own namespace

5
etemplate/inc/class.etemplate_widget_button.inc.php
View File

@ -21,12 +21,12 @@ class etemplate_widget_button extends etemplate_widget
*
* Readonly buttons can NOT be pressed
*
* @param string $cname current namespace
* @param array $content
* @param array &$validated=array() validated content
* @param string $cname='' current namespace
* @return boolean true if no validation error, false otherwise
*/
public function validate(array $content, &$validated=array(), $cname = '')
public function validate($cname, array $content, &$validated=array())
{
$form_name = self::form_name($cname, $this->id);
@ -45,6 +45,5 @@ class etemplate_widget_button extends etemplate_widget
self::$request->button_pressed = true;
}
}
return parent::validate($content, $validated, $cname);
}
}

631
etemplate/inc/class.etemplate_widget_menupopup.inc.php Normal file
View File

@ -0,0 +1,631 @@
<?php
/**
* EGroupware - eTemplate serverside select widget
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package etemplate
* @subpackage api
* @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de>
* @copyright 2002-11 by RalfBecker@outdoor-training.de
* @version $Id$
*/
/**
* eTemplate select widget
*
* @todo new account selection method
*/
class etemplate_widget_menupopup extends etemplate_widget
{
/**
* @var array
*/
protected static $monthnames = array(
0 => '',
1 => 'January',
2 => 'February',
3 => 'March',
4 => 'April',
5 => 'May',
6 => 'June',
7 => 'July',
8 => 'August',
9 => 'September',
10 => 'October',
11 => 'November',
12 => 'December'
);
/**
* Parse and set extra attributes from xml in template object
*
* Reimplemented to parse our differnt attributes
*
* @param string|XMLReader $xml
* @return etemplate_widget_template current object or clone, if any attribute was set
* @todo Use legacy_attributes instead of leaving it to typeOptions method to parse them
*/
public function set_attrs($xml)
{
parent::set_attrs($xml);
// set attrs[multiple] from attrs[options], unset options only if it just contains number or rows
if ($this->attrs['options'] > 1)
{
$this->attrs['multiple'] = (int)$this->attrs['options'];
if ((string)$this->attrs['multiple'] == $this->attrs['options'])
{
unset($this->attrs['options']);
}
}
}
/**
* Validate input
*
* @param string $cname current namespace
* @param array $content
* @param array &$validated=array() validated content
*/
public function validate($cname, array $content, &$validated=array())
{
$form_name = self::form_name($cname, $this->id);
$ok = true;
if (!$this->is_readonly($cname))
{
$value = $value_in = self::get_array($content, $form_name);
$allowed = $this->attrs['multiple'] ? array() : array('' => $this->attrs['options']);
/* if fillTypeOptions is used, we dont need to call it again here
if ($this->attrs['type'])
{
$allowed += self::typeOptions($form_name, $this->attrs['type'], $this->attrs['no_lang']);
// current eTemplate uses sel_options too, not sure if we want/need to keep that
//$allowed += self::selOptions($form_name, $this->attrs['no_lang']);
}
else*/
{
$allowed += self::selOptions($form_name, $this->attrs['no_lang']);
}
foreach((array) $value as $val)
{
if (!($this->attrs['multiple'] && !$val) && !isset($allowed[$val]))
{
self::set_validation_error($form_name,lang("'%1' is NOT allowed ('%2')!",$val,implode("','",array_keys($allowed))),'');
$value = '';
break;
}
}
if (is_array($value)) $value = implode(',',$value);
if ($ok && $value === '' && $this->attrs['needed'])
{
self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
}
$valid =& self::get_array($validated, $form_name, true);
$valid = $value;
error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
}
}
/**
* Fill type options in self::$request->sel_options to be used on the client
*
* @param string $cname
*/
public function fillTypeOptions($cname)
{
if ($this->attrs['type'])
{
$form_name = self::form_name($cname, $this->id);
// += to keep further options set by app code
if (!isset(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = array();
self::$request->sel_options[$form_name] += self::typeOptions($this->attrs['type'], $this->attrs['options']);
}
}
/**
* Get options from $sel_options array for a given selectbox name
*
* @param string $name
* @param boolean $no_lang=false value of no_lang attribute
* @return array
*/
public static function selOptions($name, $no_lang=false)
{
$options = array();
if (isset(self::$request->sel_options[$name]) && is_array(self::$request->sel_options[$name]))
{
$options += self::$request->sel_options[$name];
}
else
{
$name_parts = explode('[',str_replace(']','',$name));
if (count($name_parts))
{
$org_name = $name_parts[count($name_parts)-1];
if (isset(self::$request->sel_options[$org_name]) && is_array(self::$request->sel_options[$org_name]))
{
$options += self::$request->sel_options[$org_name];
}
elseif (isset(self::$request->sel_options[$name_parts[0]]) && is_array(self::$request->sel_options[$name_parts[0]]))
{
$options += self::$request->sel_options[$name_parts[0]];
}
}
}
if (isset(self::$request->content['options-'.$name]))
{
$options += self::$request->content['options-'.$name];
}
if (!$no_lang)
{
foreach($options as $value => &$label)
{
$label = lang($label);
}
}
//error_log(__METHOD__."('$name') returning ".array2string($options));
return $options;
}
/**
* Fetch options for certain select-box types
*
* @param string $widget_type
* @param string $legacy_options options string of widget
* @param boolean $no_lang=false initial value of no_lang attribute (some types set it to true)
* @param boolean $readonly=false for readonly we dont need to fetch all options, only the one for value
* @param mixed $value=null value for readonly
* @return array with value => label pairs
*/
public static function typeOptions($widget_type, $legacy_options, $no_lang=false, $readonly=false, $value=null)
{
list($rows,$type,$type2,$type3,$type4,$type5,$type6) = explode(',',$legacy_options);
$no_lang = false;
switch ($widget_type)
{
case 'select-percent': // options: #row,decrement(default=10)
$decr = $type > 0 ? $type : 10;
for ($i=0; $i <= 100; $i += $decr)
{
$options[intval($i)] = intval($i).'%';
}
$options[100] = '100%';
if (!$rows || !empty($value))
{
$value = intval(($value+($decr/2)) / $decr) * $decr;
}
$no_lang = True;
break;
case 'select-priority':
$options = array('','low','normal','high');
break;
case 'select-bool': // equal to checkbox, can be used with nextmatch-customfilter to filter a boolean column
$options = array(0 => 'no',1 => 'yes');
break;
case 'select-access':
$options = array(
'private' => 'Private',
'public' => 'Global public',
'group' => 'Group public'
);
break;
case 'select-country': // #Row|Extralabel,1=use country name, 0=use 2 letter-code,custom country field name
if($type == 0 && $type2)
{
$custom_label = is_numeric($type2) ? 'Custom' : $type2;
$options = array('-custom-' => lang($custom_label)) + $GLOBALS['egw']->country->countries();
}
else
{
$options = $GLOBALS['egw']->country->countries();
}
if (($extension_data['country_use_name'] = $type) && $value)
{
$value = $GLOBALS['egw']->country->country_code($value);
if (!isset($options[$value]))
{
if($type2)
{
$options[$value] = $value;
}
}
}
$no_lang = True;
break;
case 'select-state':
$options = $GLOBALS['egw']->country->us_states();
$no_lang = True;
break;
case 'select-cat': // !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
if ($readonly) // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
{
$no_lang = True;
if ($value)
{
if (!is_array($value)) $value = explode(',',$value);
foreach($value as $key => $id)
{
if ($id && ($name = stripslashes($GLOBALS['egw']->categories->id2name($id))) && $name != '--')
{
$options[$id] = $name;
}
else
{
if(!$type6)
{
unset($value[$key]); // remove not (longer) existing or inaccessible cats
}
elseif ($id) // Display id of no longer existing cat
{
$options[$id] = $type6 == '2' ? $id : lang('Missing: %1',$id);
}
}
}
}
else
{
$value = '';
}
break;
}
if ((!$type3 || $type3 === $GLOBALS['egw']->categories->app_name) &&
(!$type5 || $type5 == $GLOBALS['egw']->categories->account_id))
{
$categories = $GLOBALS['egw']->categories;
}
else // we need to instanciate a new cat object for the correct application
{
$categories = new categories($type5,$type3);
}
// we cast $type4 (parent) to int, to get default of 0 if omitted
foreach((array)$categories->return_sorted_array(0,False,'','','',!$type,(int)$type4,true) as $cat)
{
$s = str_repeat('&nbsp;',$cat['level']) . stripslashes($cat['name']);
if (categories::is_global($cat))
{
$s .= ' &#9830;';
}
$options[$cat['id']] = empty($cat['description']) ? $s : array(
'label' => $s,
'title' => $cat['description'],
);
}
// preserv unavailible cats (eg. private user-cats)
/* TODO
if ($value && ($unavailible = array_diff(is_array($value) ? $value : explode(',',$value),array_keys((array)$options))))
{
$extension_data['unavailible'] = $unavailible;
}
$cell['size'] = $rows.($type2 ? ','.$type2 : '');
*/
$no_lang = True;
break;
case 'select-account': // options: #rows,{accounts(default)|both|groups|owngroups},{0(=lid)|1(default=name)|2(=lid+name),expand-multiselect-rows,not-to-show-accounts,...)}
//echo "<p>select-account widget: name=$cell[name], type='$type', rows=$rows, readonly=".(int)($cell['readonly'] || $readonlys)."</p>\n";
if($type == 'owngroups')
{
$type = 'groups';
$owngroups = true;
foreach($GLOBALS['egw']->accounts->membership() as $group) $mygroups[] = $group['account_id'];
}
// in case of readonly, we read/create only the needed entries, as reading accounts is expensive
if ($readonly)
{
$no_lang = True;
if (!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
foreach(is_array($value) ? $value : array($value) as $id)
{
$options[$id] = !$id && !is_numeric($rows) ? lang($rows) :
self::accountInfo($id,$acc,$type2,$type=='both');
}
break;
}
/* account-selection for hughe number of accounts
if ($this->ui == 'html' && $type != 'groups') // use eGW's new account-selection (html only)
{
$not = array_slice(explode(',',$cell['size']),4);
$help = (int)$no_lang < 2 ? lang($cell['help']) : $cell['help'];
$onFocus = "self.status='".addslashes(htmlspecialchars($help))."'; return true;";
$onBlur = "self.status=''; return true;";
if ($cell['noprint'])
{
foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
{
if ($id) $onlyPrint[] = self::accountInfo($id,$acc,$type2,$type=='both');
}
$onlyPrint = $onlyPrint ? implode('<br />',$onlyPrint) : lang((int)$rows < 0 ? 'all' : $rows);
$noPrint_class = ' class="noPrint"';
}
if (($rows > 0 || $type3) && substr($name,-2) != '[]') $name .= '[]';
$value = $GLOBALS['egw']->uiaccountsel->selection($name,'eT_accountsel_'.str_replace(array('[','][',']'),array('_','_',''),$name),
$value,$type,$rows > 0 ? $rows : ($type3 ? -$type3 : 0),$not,' onfocus="'.$onFocus.'" onblur="'.$onBlur.'"'.$noPrint_class,
$cell['onchange'] == '1' ? 'this.form.submit();' : $cell['onchange'],
!empty($rows) && 0+$rows <= 0 ? lang($rows < 0 ? 'all' : $rows) : False);
if ($cell['noprint'])
{
$value = '<span class="onlyPrint">'.$onlyPrint.'</span>'.$value;
}
$cell['type'] = 'html';
$cell['size'] = ''; // is interpreted as link otherwise
etemplate::$request->set_to_process($name,'select');
break;
}*/
$no_lang = True;
$accs = $GLOBALS['egw']->accounts->get_list(empty($type) ? 'accounts' : $type); // default is accounts
foreach($accs as $acc)
{
if ($acc['account_type'] == 'u')
{
$options[$acc['account_id']] = self::accountInfo($acc['account_id'],$acc,$type2,$type=='both');
}
}
foreach($accs as $acc)
{
if ($acc['account_type'] == 'g' && (!$owngroups || ($owngroups && in_array($acc['account_id'],(array)$mygroups))))
{
$options[$acc['account_id']] = self::accountInfo($acc['account_id'],$acc,$type2,$type=='both');
}
}
break;
case 'select-year': // options: #rows,#before(default=3),#after(default=2)
$options[''] = '';
if ($type <= 0) $type = 3;
if ($type2 <= 0) $type2 = 2;
if ($type > 100 && $type2 > 100 && $type > $type) { $y = $type; $type=$type2; $type2=$y; }
$y = date('Y')-$type;
if ($value && $value-$type < $y || $type > 100) $y = $type > 100 ? $type : $value-$type;
$to = date('Y')+$type2;
if ($value && $value+$type2 > $to || $type2 > 100) $to = $type2 > 100 ? $type2 : $value+$type2;
for ($n = 0; $y <= $to && $n < 200; ++$n)
{
$options[$y] = $y++;
}
$no_lang = True;
break;
case 'select-month':
$options = self::$monthnames;
$value = intval($value);
break;
case 'select-dow': // options: rows[,0=summaries befor days, 1=summaries after days, 2=no summaries[,extraStyleMultiselect]]
if (!defined('MCAL_M_SUNDAY'))
{
define('MCAL_M_SUNDAY',1);
define('MCAL_M_MONDAY',2);
define('MCAL_M_TUESDAY',4);
define('MCAL_M_WEDNESDAY',8);
define('MCAL_M_THURSDAY',16);
define('MCAL_M_FRIDAY',32);
define('MCAL_M_SATURDAY',64);
define('MCAL_M_WEEKDAYS',62);
define('MCAL_M_WEEKEND',65);
define('MCAL_M_ALLDAYS',127);
}
$weekstart = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
$options = array();
if ($rows >= 2 && !$type)
{
$options = array(
MCAL_M_ALLDAYS => 'all days',
MCAL_M_WEEKDAYS => 'working days',
MCAL_M_WEEKEND => 'weekend',
);
}
if ($weekstart == 'Saturday') $options[MCAL_M_SATURDAY] = 'saturday';
if ($weekstart != 'Monday') $options[MCAL_M_SUNDAY] = 'sunday';
$options += array(
MCAL_M_MONDAY => 'monday',
MCAL_M_TUESDAY => 'tuesday',
MCAL_M_WEDNESDAY=> 'wednesday',
MCAL_M_THURSDAY => 'thursday',
MCAL_M_FRIDAY => 'friday',
);
if ($weekstart != 'Saturday') $options[MCAL_M_SATURDAY] = 'saturday';
if ($weekstart == 'Monday') $options[MCAL_M_SUNDAY] = 'sunday';
if ($rows >= 2 && $type == 1)
{
$options += array(
MCAL_M_ALLDAYS => 'all days',
MCAL_M_WEEKDAYS => 'working days',
MCAL_M_WEEKEND => 'weekend',
);
}
$value_in = $value;
$value = array();
foreach($options as $val => $lable)
{
if (($value_in & $val) == $val)
{
$value[] = $val;
if ($val == MCAL_M_ALLDAYS ||
$val == MCAL_M_WEEKDAYS && $value_in == MCAL_M_WEEKDAYS ||
$val == MCAL_M_WEEKEND && $value_in == MCAL_M_WEEKEND)
{
break; // dont set the others
}
}
}
if (!$readonly)
{
etemplate::$request->set_to_process($name,'ext-select-dow');
}
$cell['size'] = $rows.($type2 ? ','.$type2 : '');
break;
case 'select-day':
$type = 1;
$type2 = 31;
$type3 = 1;
// fall-through
case 'select-number': // options: rows,min,max,decrement,suffix
$type = $type === '' ? 1 : intval($type); // min
$type2 = $type2 === '' ? 10 : intval($type2); // max
$format = '%d';
if (!empty($type3) && $type3[0] == '0') // leading zero
{
$format = '%0'.strlen($type3).'d';
}
$type3 = !$type3 ? 1 : intval($type3); // decrement
if (($type <= $type2) != ($type3 > 0))
{
$type3 = -$type3; // void infinite loop
}
if (!empty($type4)) $format .= lang($type4);
for ($i=0,$n=$type; $n <= $type2 && $i <= 100; $n += $type3,++$i)
{
$options[$n] = sprintf($format,$n);
}
$no_lang = True;
break;
case 'select-hour':
for ($h = 0; $h <= 23; ++$h)
{
$options[$h] = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ?
(($h % 12 ? $h % 12 : 12).' '.($h < 12 ? lang('am') : lang('pm'))) :
sprintf('%02d',$h);
}
$no_lang = True;
break;
case 'select-app': // type2: ''=users enabled apps, 'installed', 'all' = not installed ones too
$apps = array();
foreach ($GLOBALS['egw_info']['apps'] as $app => $data)
{
if (!$type2 || $GLOBALS['egw_info']['user']['apps'][$app])
{
$apps[$app] = $data['title'] ? $data['title'] : lang($app);
}
}
if ($type2 == 'all')
{
$dir = opendir(EGW_SERVER_ROOT);
while ($file = readdir($dir))
{
if (@is_dir(EGW_SERVER_ROOT."/$file/setup") && $file[0] != '.' &&
!isset($apps[$app = basename($file)]))
{
$apps[$app] = $app . ' (*)';
}
}
closedir($dir);
}
$apps_lower = $apps; // case-in-sensitve sort
foreach ($apps_lower as $app => $title)
{
$apps_lower[$app] = strtolower($title);
}
asort($apps_lower);
foreach ($apps_lower as $app => $title)
{
$options[$app] = $apps[$app];
}
break;
case 'select-lang':
$options = translation::list_langs();
$no_lang = True;
break;
case 'select-timezone': // options: #rows,$type
if (is_numeric($value))
{
$value = calendar_timezones::id2tz($value);
}
if ($readonly) // for readonly we dont need to fetch all TZ's
{
$options[$value] = calendar_timezones::tz2id($value,'name');
}
else
{
$options = $type ? egw_time::getTimezones() : egw_time::getUserTimezones($value);
}
break;
}
if ($rows > 1)
{
unset($options['']);
}
if (!$no_lang)
{
foreach($options as $value => &$label)
{
if (!is_array($label))
{
$label = lang($label);
}
else
{
$label['label'] = lang($label['label']);
if (isset($label['title'])) $label['title'] = lang($label['title']);
}
}
}
//error_log(__METHOD__."('$widget_type', '$legacy_options', ...) returning ".array2string($options));
return $options;
}
/**
* internal function to format account-data
*/
private static function accountInfo($id,$acc=0,$longnames=0,$show_type=0)
{
if (!$id)
{
return '&nbsp;';
}
if (!is_array($acc))
{
$data = $GLOBALS['egw']->accounts->get_account_data($id);
if (!isset($data[$id])) return '#'.$id;
foreach(array('type','lid','firstname','lastname') as $name)
{
$acc['account_'.$name] = $data[$id][$name];
}
}
$info = $show_type ? '('.$acc['account_type'].') ' : '';
if ($acc['account_type'] == 'g')
{
$longnames = 1;
}
switch ($longnames)
{
case 2:
$info .= '&lt;'.$acc['account_lid'].'&gt; ';
// fall-through
case 1:
$info .= $acc['account_type'] == 'g' ? lang('group').' '.$acc['account_lid'] :
$acc['account_firstname'].' '.$acc['account_lastname'];
break;
case '0':
$info .= $acc['account_lid'];
break;
default: // use the phpgw default
$info = $GLOBALS['egw']->common->display_fullname($acc['account_lid'],
$acc['account_firstname'],$acc['account_lastname']);
break;
}
return $info;
}
}

7
etemplate/inc/class.etemplate_widget_template.inc.php
View File

@ -107,7 +107,7 @@ class etemplate_widget_template extends etemplate_widget
}
/**
* Validate input
* Run method on all children
*
* Reimplemented because templates can have an own namespace specified in attrs[content], NOT id!
*
@ -117,11 +117,12 @@ class etemplate_widget_template extends etemplate_widget
* @return boolean true if no validation error, false otherwise
* @todo handle template references containing content in id, eg. id="edit.$cont[something]"
*/
public function validate(array $content, &$validated=array(), $cname = '')
public function run($method_name, $params=array(''))
{
$cname =& $params[0];
if ($this->attrs['content']) $cname = self::form_name($cname, $this->attrs['content']);
return parent::validate($content, $validated, $cname);
parent::run($method_name, $params);
}
}

14
etemplate/inc/class.etemplate_widget_textbox.inc.php
View File

@ -52,14 +52,12 @@ class etemplate_widget_textbox extends etemplate_widget
* - preg: perl regular expression incl. delimiters (set by default for int, float and colorpicker)
* - int and float get casted to their type
*
* @param string $cname current namespace
* @param array $content
* @param array &$validated=array() validated content
* @param string $cname='' current namespace
* @return boolean true if no validation error, false otherwise
*/
public function validate(array $content, &$validated=array(), $cname = '')
public function validate($cname, array $content, &$validated=array())
{
$ok = true;
if (!$this->is_readonly($cname))
{
if (!isset($this->attrs['preg']))
@ -79,13 +77,12 @@ class etemplate_widget_textbox extends etemplate_widget
}
$form_name = self::form_name($cname, $this->id);
$value = self::get_array($content, $form_name);
$value = $value_in = self::get_array($content, $form_name);
$valid =& self::get_array($validated, $form_name, true);
if ((string)$value === '' && $this->attrs['needed'])
{
self::set_validation_error($form_name,lang('Field must not be empty !!!'),'');
$ok = false;
}
if ((int) $this->attrs['maxlength'] > 0 && strlen($value) > (int) $this->attrs['maxlength'])
{
@ -105,7 +102,6 @@ class etemplate_widget_textbox extends etemplate_widget
self::set_validation_error($form_name,lang("'%1' has an invalid format !!!",$value)/*." !preg_match('$this->attrs[preg]', '$value')"*/,'');
break;
}
$ok = false;
}
elseif ($this->type == 'integer' || $this->type == 'float') // cast int and float and check range
{
@ -117,19 +113,17 @@ class etemplate_widget_textbox extends etemplate_widget
{
self::set_validation_error($form_name,lang("Value has to be at least '%1' !!!",$this->attrs['min']),'');
$value = $this->type == 'integer' ? (int) $this->attrs['min'] : (float) $this->attrs['min'];
$ok = false;
}
if (!empty($this->attrs['max']) && $value > $this->attrs['max'])
{
self::set_validation_error($form_name,lang("Value has to be at maximum '%1' !!!",$this->attrs['max']),'');
$value = $this->type == 'integer' ? (int) $this->attrs['max'] : (float) $this->attrs['max'];
$ok = false;
}
}
}
$valid = $value;
error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value));
}
return parent::validate($content, $validated, $cname) && $ok;
}
}
etemplate_widget::registerWidget('etemplate_widget_textbox', array('textbox','int','integer','float','passwd','hidden','colorpicker'));