[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.8,1.9
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.8,1.9 class.uietemplate.inc.php,1.11,1.12 class.uietemplate_gtk.inc.php,1.8,1.9 |
|
Date: |
Sat, 15 Jun 2002 05:21:57 -0400 |
Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv32318
Modified Files:
class.boetemplate.inc.php class.uietemplate.inc.php
class.uietemplate_gtk.inc.php
Log Message:
changed argument-order of isset_array to be the same as in set_array and
get_array: isset_array($arr,$idx)
Index: class.boetemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.boetemplate.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.boetemplate.inc.php 9 Jun 2002 21:34:21 -0000 1.8
--- class.boetemplate.inc.php 15 Jun 2002 09:21:55 -0000 1.9
***************
*** 268,275 ****
/*!
! @function isset_array($idx,$arr)
@abstract checks if idx, which may contain ONE subindex is set
in array
*/
! function isset_array($idx,$arr)
{
if (ereg('^([^[]*)\\[(.*)\\]$',$idx,$regs))
--- 268,275 ----
/*!
! @function isset_array($arr,$idx)
@abstract checks if idx, which may contain ONE subindex is set
in array
*/
! function isset_array($arr,$idx)
{
if (ereg('^([^[]*)\\[(.*)\\]$',$idx,$regs))
Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uietemplate.inc.php 10 Jun 2002 21:34:58 -0000 1.11
--- class.uietemplate.inc.php 15 Jun 2002 09:21:55 -0000 1.12
***************
*** 229,233 ****
if
(!($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) && $idx_cname) &&
!($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) && $idx_cname) ||
!
!$this->isset_array($idx,$content))
{
break;
// no auto-row-repeat
--- 229,233 ----
if
(!($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) && $idx_cname) &&
!($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) && $idx_cname) ||
!
!$this->isset_array($content,$idx))
{
break;
// no auto-row-repeat
***************
*** 247,251 ****
$cell = $old_cell;
if
(!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True) ||
!
!$this->isset_array($idx,$content))
{
break; // no
auto-col-repeat
--- 247,251 ----
$cell = $old_cell;
if
(!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True) ||
!
!$this->isset_array($content,$idx))
{
break; // no
auto-col-repeat
***************
*** 316,319 ****
--- 316,323 ----
list($span) = explode(',',$cell['span']); //
evtl. overriten later for type template
+ if ($cell['name'][0] == '@')
+ {
+ $cell['name'] =
$this->get_array($content,substr($cell['name'],1));
+ }
$name =
$this->expand_name($cell['name'],$show_c,$show_row,$content['.c'],$content['.row'],$content);
***************
*** 591,597 ****
list($nul,$cell) = each($cols);
reset($cols);
if
((!$this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) ||
! $idx_cname == '' ||
!$this->isset_array($idx,$content)) &&
(!$this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) ||
! $idx_cname == '' ||
!$this->isset_array($idx,$content)))
{
break; // no auto-row-repeat
--- 595,601 ----
list($nul,$cell) = each($cols);
reset($cols);
if
((!$this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) ||
! $idx_cname == '' ||
!$this->isset_array($content,$idx)) &&
(!$this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) ||
! $idx_cname == '' ||
!$this->isset_array($content,$idx)))
{
break; // no auto-row-repeat
***************
*** 606,610 ****
$cell = $old_cell;
if
(!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True) ||
! $idx_cname == '' ||
!$this->isset_array($idx,$content))
{
break; // no
auto-col-repeat
--- 610,614 ----
$cell = $old_cell;
if
(!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True) ||
! $idx_cname == '' ||
!$this->isset_array($content,$idx))
{
break; // no
auto-col-repeat
Index: class.uietemplate_gtk.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate_gtk.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uietemplate_gtk.inc.php 7 Jun 2002 21:56:34 -0000 1.8
--- class.uietemplate_gtk.inc.php 15 Jun 2002 09:21:55 -0000 1.9
***************
*** 313,317 ****
if
(!($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) && $idx_cname) &&
!($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) && $idx_cname) ||
!
!$this->isset_array($idx,$content))
{
break;
// no auto-row-repeat
--- 313,317 ----
if
(!($this->autorepeat_idx($cols['A'],0,$r,$idx,$idx_cname) && $idx_cname) &&
!($this->autorepeat_idx($cols['B'],1,$r,$idx,$idx_cname) && $idx_cname) ||
!
!$this->isset_array($content,$idx))
{
break;
// no auto-row-repeat
***************
*** 342,346 ****
$cell = $old_cell;
if
(!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True) ||
!
!$this->isset_array($idx,$content))
{
break; // no
auto-col-repeat
--- 342,346 ----
$cell = $old_cell;
if
(!$this->autorepeat_idx($cell,$c,$r,$idx,$idx_cname,True) ||
!
!$this->isset_array($content,$idx))
{
break; // no
auto-col-repeat
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.8,1.9 class.uietemplate.inc.php,1.11,1.12 class.uietemplate_gtk.inc.php,1.8,1.9,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: xmlrpc test.pl,1.1.1.1,NONE test.py,1.1.1.1,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.9,1.10
- Previous by thread:
[Phpgroupware-cvs] CVS: xmlrpc test.pl,1.1.1.1,NONE test.py,1.1.1.1,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.9,1.10
- Index(es):