+2006-06-30 Franz Holzinger <kontakt@fholzinger.com>
+
+ * Fix bug #3725: empty and invalid flexform meta data are checked. impexp echos warning message found inside T3D import.
+
2006-06-30 Martin Kutschker <martin.t.kutschker@blackbox.net>
* t3lib_htmlmail: auto-detect charset (using FE or BE settings) with manual override
$langChildren = $dataStructArray['meta']['langChildren'] ? 1 : 0;
$langDisabled = $dataStructArray['meta']['langDisable'] ? 1 : 0;
+ // empty or invalid <meta>
+ if (!is_array($editData['meta'])) {
+ $editData['meta'] = array();
+ }
$editData['meta']['currentLangId'] = array();
$languages = $this->getAvailableLanguages();
// getting header data
$initStr = fread($fd, $initStrLen);
$initStrDat = explode(':',$initStr);
- if (!strcmp($initStrDat[3],'')) {
- $datString = fread($fd,intval($initStrDat[2]));
- fread($fd,1);
- if (!strcmp(md5($datString), $initStrDat[0])) {
- if ($initStrDat[1]) {
- if ($this->compress) {
- $datString = gzuncompress($datString);
- } else $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.',1);
- }
- return $unserialize ? unserialize($datString) : $datString;
- } else $this->error('MD5 check failed ('.$name.')');
- } else $this->error('File read error: InitString had a wrong length. ('.$name.')');
+ if (strstr($initStrDat[0],'Warning') == FALSE) {
+ if (!strcmp($initStrDat[3],'')) {
+ $datString = fread($fd,intval($initStrDat[2]));
+ fread($fd,1);
+ if (!strcmp(md5($datString), $initStrDat[0])) {
+ if ($initStrDat[1]) {
+ if ($this->compress) {
+ $datString = gzuncompress($datString);
+ } else $this->error('Content read error: This file requires decompression, but this server does not offer gzcompress()/gzuncompress() functions.',1);
+ }
+ return $unserialize ? unserialize($datString) : $datString;
+ } else $this->error('MD5 check failed ('.$name.')');
+ } else $this->error('File read error: InitString had a wrong length. ('.$name.')');
+ } else $this->error('File read error: Warning message in file. ('.$initStr.fgets($fd).')');
}
/**