extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-10 07:21:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed php5.2.6 problem: unknown type ''

Browse Source
This commit is contained in:
Ralf Becker 2008-06-22 07:16:40 +00:00
parent ecd3948175
commit f66e2e4004
2 changed files with 1018 additions and 1017 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -1,17 +1,19 @@
<?php <?php
/** /**
* eGroupWare eTemplate Extension - Nextmatch Widget * eGroupWare eTemplate Extension - Nextmatch Widget
* *
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @copyright 2002-8 by RalfBecker@outdoor-training.de
* @package etemplate * @package etemplate
* @subpackage extensions
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de> * @author Ralf Becker <RalfBecker@outdoor-training.de>
* @version $Id$ * @version $Id$
*/ */
require_once(EGW_INCLUDE_ROOT. '/etemplate/inc/class.etemplate.inc.php'); require_once(EGW_INCLUDE_ROOT. '/etemplate/inc/class.etemplate.inc.php');
/** /**
* eTemplate Extension: Widget that show only a certain number of data-rows and allows to modifiy the rows shown (scroll). * eTemplate Extension: Widget that show only a certain number of data-rows and allows to modifiy the rows shown (scroll).
* *
* This widget replaces the old nextmatch-class. It is independent of the UI, * This widget replaces the old nextmatch-class. It is independent of the UI,
@ -56,13 +58,9 @@
* 'csv_fields' => // I false=disable csv export, true or unset=enable it with auto-detected fieldnames, * 'csv_fields' => // I false=disable csv export, true or unset=enable it with auto-detected fieldnames,
* or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type) * or array with name=>label or name=>array('label'=>label,'type'=>type) pairs (type is a eT widget-type)
* ); * );
* @package etemplate
* @subpackage extensions
* @author RalfBecker-AT-outdoor-training.de
* @license GPL
*/ */
class nextmatch_widget class nextmatch_widget
{ {
/** /**
* Prefix for custom field names * Prefix for custom field names
* *
@ -198,13 +196,16 @@
} }
if (self::last_part($name) == $nm_global['order']) // we're the active column if (self::last_part($name) == $nm_global['order']) // we're the active column
{ {
$cell[1] = $cell; $sorting = $cell;
unset($cell[1]['align']); unset($sorting['align']);
$cell[2] = $tmpl->empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up'); unset($sorting['span']);
$cell['type'] = 'hbox'; $cell = etemplate::empty_cell('hbox','',array(
$cell['size'] = '2,,0,0'; 'span' => $cell['span'],
'size' => '2,,0,0',
1 => $sorting,
2 => etemplate::empty_cell('image',$nm_global['sort'] != 'DESC' ? 'down' : 'up'),
));
$class = 'activ_sortcolumn'; $class = 'activ_sortcolumn';
$cell['name'] = $cell['label'] = '';
} }
else else
{ {
@ -1085,4 +1086,4 @@
//_debug_array($fields); //_debug_array($fields);
return $fields; return $fields;
} }
} }

2
etemplate/inc/class.soetemplate.inc.php
View File

@ -171,7 +171,7 @@ class soetemplate
); );
if ($attributes && is_array($attributes)) if ($attributes && is_array($attributes))
{ {
return array_merge($attributes,$cell); $cell += $attributes;
} }
return $cell; return $cell;
} }