extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed error messages if olny an other version of an eTemplate is found.

Browse Source 
added message if an imported eTemplate/xul-file contains more than one template.
This commit is contained in:
Ralf Becker 2002-09-24 09:58:07 +00:00
parent 7e2f07bde1
commit 7751df9f39
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etemplate/inc/class.editor.inc.php
View File

@ -328,10 +328,14 @@
{ {
return $this->list_result(array('result' => $result)); return $this->list_result(array('result' => $result));
} }
elseif (!count($result) || $this->etemplate->read($result[0])) elseif (!count($result) || !$this->etemplate->read($result[0]))
{ {
$msg = $this->messages['not_found']; $msg = $this->messages['not_found'];
} }
elseif ($content['name'] == $result[0]['name'])
{
$msg = $this->messages['other_version'];
}
} }
} }
elseif ($newest_version != '' && $this->etemplate->version != $newest_version) elseif ($newest_version != '' && $this->etemplate->version != $newest_version)
@ -445,13 +449,20 @@
{ {
$this->etemplate->xul_io = CreateObject('etemplate.xul_io'); $this->etemplate->xul_io = CreateObject('etemplate.xul_io');
} }
$msg = $this->etemplate->xul_io->import(&$this->etemplate,$xul); $imported = $this->etemplate->xul_io->import(&$this->etemplate,$xul);
if (!$msg) if (is_array($imported))
{ {
$msg = sprintf($this->messages['imported'],$this->etemplate->name); if (count($imported) == 1)
{
$imported = sprintf($this->messages['imported'],$this->etemplate->name);
} }
return $msg; else
{
$imported = 'File contains more than one etemplates, last one is shown !!!';
}
}
return $imported;
} }
function delete($post_vars='',$back = 'edit') function delete($post_vars='',$back = 'edit')