[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.15,1.16
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.15,1.16 |
Date: |
Tue, 24 Sep 2002 05:58:11 -0400 |
Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv4392
Modified Files:
class.editor.inc.php
Log Message:
fixed error messages if olny an other version of an eTemplate is found.
added message if an imported eTemplate/xul-file contains more than one template.
Index: class.editor.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.editor.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.editor.inc.php 17 Sep 2002 13:27:37 -0000 1.15
--- class.editor.inc.php 24 Sep 2002 09:58:07 -0000 1.16
***************
*** 329,336 ****
return
$this->list_result(array('result' => $result));
}
! elseif (!count($result) ||
$this->etemplate->read($result[0]))
{
$msg =
$this->messages['not_found'];
}
}
}
--- 329,340 ----
return
$this->list_result(array('result' => $result));
}
! elseif (!count($result) ||
!$this->etemplate->read($result[0]))
{
$msg =
$this->messages['not_found'];
}
+ elseif ($content['name'] ==
$result[0]['name'])
+ {
+ $msg =
$this->messages['other_version'];
+ }
}
}
***************
*** 446,456 ****
$this->etemplate->xul_io =
CreateObject('etemplate.xul_io');
}
! $msg =
$this->etemplate->xul_io->import(&$this->etemplate,$xul);
! if (!$msg)
{
! $msg =
sprintf($this->messages['imported'],$this->etemplate->name);
}
! return $msg;
}
--- 450,467 ----
$this->etemplate->xul_io =
CreateObject('etemplate.xul_io');
}
! $imported =
$this->etemplate->xul_io->import(&$this->etemplate,$xul);
! if (is_array($imported))
{
! if (count($imported) == 1)
! {
! $imported =
sprintf($this->messages['imported'],$this->etemplate->name);
! }
! else
! {
! $imported = 'File contains more than
one etemplates, last one is shown !!!';
! }
}
! return $imported;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.15,1.16,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: etemplate/inc class.xmltool.inc.php,NONE,1.1 class.xul_io.inc.php,1.10,1.11 xmltools.php,1.1,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.17,1.18 class.soetemplate.inc.php,1.12,1.13 class.uietemplate.inc.php,1.18,1.19
- Previous by thread:
[Phpgroupware-cvs] CVS: etemplate/inc class.xmltool.inc.php,NONE,1.1 class.xul_io.inc.php,1.10,1.11 xmltools.php,1.1,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: etemplate/inc class.boetemplate.inc.php,1.17,1.18 class.soetemplate.inc.php,1.12,1.13 class.uietemplate.inc.php,1.18,1.19
- Index(es):