pid int(11) unsigned DEFAULT '0' NOT NULL,
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
title varchar(20) DEFAULT '' NOT NULL,
- non_exclude_fields blob NOT NULL,
- explicit_allowdeny blob NOT NULL,
- allowed_languages tinyblob NOT NULL,
- custom_options blob NOT NULL,
+ non_exclude_fields text NOT NULL,
+ explicit_allowdeny text NOT NULL,
+ allowed_languages tinytext NOT NULL,
+ custom_options text NOT NULL,
db_mountpoints varchar(40) DEFAULT '' NOT NULL,
- pagetypes_select tinyblob NOT NULL,
- tables_select blob NOT NULL,
- tables_modify blob NOT NULL,
+ pagetypes_select tinytext NOT NULL,
+ tables_select text NOT NULL,
+ tables_modify text NOT NULL,
crdate int(11) unsigned DEFAULT '0' NOT NULL,
cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
- groupMods tinyblob NOT NULL,
+ groupMods tinytext NOT NULL,
file_mountpoints varchar(40) DEFAULT '' NOT NULL,
- hidden tinyint(3) unsigned DEFAULT '0' NOT NULL,
+ hidden tinyint(1) unsigned DEFAULT '0' NOT NULL,
inc_access_lists tinyint(3) unsigned DEFAULT '0' NOT NULL,
description text NOT NULL,
lockToDomain varchar(50) DEFAULT '' NOT NULL,
- deleted tinyint(3) unsigned DEFAULT '0' NOT NULL,
- TSconfig blob NOT NULL,
- subgroup tinyblob NOT NULL,
+ deleted tinyint(1) unsigned DEFAULT '0' NOT NULL,
+ TSconfig text NOT NULL,
+ subgroup tinytext NOT NULL,
hide_in_lists tinyint(4) DEFAULT '0' NOT NULL,
workspace_perms tinyint(3) DEFAULT '1' NOT NULL,
PRIMARY KEY (uid),
ses_hashlock int(11) DEFAULT '0' NOT NULL,
ses_userid int(11) unsigned DEFAULT '0' NOT NULL,
ses_tstamp int(11) unsigned DEFAULT '0' NOT NULL,
- ses_data mediumblob NOT NULL,
+ ses_data mediumtext NOT NULL,
ses_backuserid int(11) NOT NULL default '0',
PRIMARY KEY (ses_id,ses_name)
);
username varchar(20) DEFAULT '' NOT NULL,
password varchar(40) DEFAULT '' NOT NULL,
admin tinyint(4) unsigned DEFAULT '0' NOT NULL,
- usergroup tinyblob NOT NULL,
- disable tinyint(4) unsigned DEFAULT '0' NOT NULL,
+ usergroup tinytext NOT NULL,
+ disable tinyint(1) unsigned DEFAULT '0' NOT NULL,
starttime int(11) unsigned DEFAULT '0' NOT NULL,
endtime int(11) unsigned DEFAULT '0' NOT NULL,
lang varchar(2) DEFAULT '' NOT NULL,
crdate int(11) unsigned DEFAULT '0' NOT NULL,
cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
realName varchar(80) DEFAULT '' NOT NULL,
- userMods tinyblob NOT NULL,
- allowed_languages tinyblob NOT NULL,
- uc blob NOT NULL,
+ userMods tinytext NOT NULL,
+ allowed_languages tinytext NOT NULL,
+ uc text NOT NULL,
file_mountpoints varchar(40) DEFAULT '' NOT NULL,
fileoper_perms tinyint(4) DEFAULT '0' NOT NULL,
workspace_perms tinyint(3) DEFAULT '1' NOT NULL,
lockToDomain varchar(50) DEFAULT '' NOT NULL,
- disableIPlock tinyint(3) unsigned DEFAULT '0' NOT NULL,
- deleted tinyint(3) unsigned DEFAULT '0' NOT NULL,
- TSconfig blob NOT NULL,
+ disableIPlock tinyint(1) unsigned DEFAULT '0' NOT NULL,
+ deleted tinyint(1) unsigned DEFAULT '0' NOT NULL,
+ TSconfig text NOT NULL,
lastlogin int(10) unsigned DEFAULT '0' NOT NULL,
createdByAction int(11) DEFAULT '0' NOT NULL,
usergroup_cached_list tinytext NOT NULL,
#
CREATE TABLE cache_hash (
hash varchar(32) DEFAULT '' NOT NULL,
- content mediumblob NOT NULL,
+ content mediumtext NOT NULL,
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
ident varchar(20) DEFAULT '' NOT NULL,
PRIMARY KEY (hash)
t3_origuid int(11) DEFAULT '0' NOT NULL,
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
sorting int(11) unsigned DEFAULT '0' NOT NULL,
- deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
+ deleted tinyint(1) unsigned DEFAULT '0' NOT NULL,
perms_userid int(11) unsigned DEFAULT '0' NOT NULL,
perms_groupid int(11) unsigned DEFAULT '0' NOT NULL,
perms_user tinyint(4) unsigned DEFAULT '0' NOT NULL,
cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
title tinytext NOT NULL,
doktype tinyint(3) unsigned DEFAULT '0' NOT NULL,
- TSconfig blob NOT NULL,
+ TSconfig text NOT NULL,
storage_pid int(11) DEFAULT '0' NOT NULL,
is_siteroot tinyint(4) DEFAULT '0' NOT NULL,
php_tree_stop tinyint(4) DEFAULT '0' NOT NULL,
path varchar(120) DEFAULT '' NOT NULL,
base tinyint(4) unsigned DEFAULT '0' NOT NULL,
hidden tinyint(3) unsigned DEFAULT '0' NOT NULL,
- deleted tinyint(3) unsigned DEFAULT '0' NOT NULL,
+ deleted tinyint(1) unsigned DEFAULT '0' NOT NULL,
PRIMARY KEY (uid),
KEY parent (pid)
);
uid int(11) NOT NULL auto_increment,
pid int(11) DEFAULT '0' NOT NULL,
tstamp int(11) DEFAULT '0' NOT NULL,
- deleted tinyint(3) DEFAULT '0' NOT NULL,
+ deleted tinyint(1) DEFAULT '0' NOT NULL,
title varchar(30) DEFAULT '' NOT NULL,
description tinytext NOT NULL,
adminusers tinytext NOT NULL,
freeze tinyint(3) DEFAULT '0' NOT NULL,
live_edit tinyint(3) DEFAULT '0' NOT NULL,
vtypes tinyint(3) DEFAULT '0' NOT NULL,
- disable_autocreate tinyint(3) DEFAULT '0' NOT NULL,
+ disable_autocreate tinyint(1) DEFAULT '0' NOT NULL,
swap_modes tinyint(3) DEFAULT '0' NOT NULL,
publish_access tinyint(3) DEFAULT '0' NOT NULL,
stagechg_notification tinyint(3) DEFAULT '0' NOT NULL,
CREATE TABLE sys_history (
uid int(11) unsigned NOT NULL auto_increment,
sys_log_uid int(11) DEFAULT '0' NOT NULL,
- history_data mediumblob NOT NULL,
- fieldlist blob NOT NULL,
+ history_data mediumtext NOT NULL,
+ fieldlist text NOT NULL,
recuid int(11) DEFAULT '0' NOT NULL,
tablename varchar(40) DEFAULT '' NOT NULL,
tstamp int(11) DEFAULT '0' NOT NULL,
- history_files mediumblob NOT NULL,
+ history_files mediumtext NOT NULL,
snapshot tinyint(4) DEFAULT '0' NOT NULL,
PRIMARY KEY (uid),
KEY recordident (tablename,recuid),
softref_key varchar(30) DEFAULT '' NOT NULL,
softref_id varchar(40) DEFAULT '' NOT NULL,
sorting int(11) DEFAULT '0' NOT NULL,
- deleted int(11) DEFAULT '0' NOT NULL,
+ deleted tinyint(1) DEFAULT '0' NOT NULL,
ref_table varchar(40) DEFAULT '' NOT NULL,
ref_uid int(11) DEFAULT '0' NOT NULL,
ref_string varchar(200) DEFAULT '' NOT NULL,
PRIMARY KEY (hash),
KEY lookup_rec (tablename,recuid),
KEY lookup_uid (ref_table,ref_uid),
- KEY lookup_string (ref_table,ref_string)
+ KEY lookup_string (ref_table,ref_string(199))
);
#
type tinyint(3) unsigned DEFAULT '0' NOT NULL,
details_nr tinyint(3) unsigned DEFAULT '0' NOT NULL,
IP varchar(39) DEFAULT '' NOT NULL,
- log_data tinyblob NOT NULL,
+ log_data tinytext NOT NULL,
event_pid int(11) DEFAULT '-1' NOT NULL,
workspace int(11) DEFAULT '0' NOT NULL,
NEWid varchar(20) DEFAULT '' NOT NULL,
/***************************************************************
* Copyright notice
*
-* (c) 2001-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+* (c) 2001-2006 Kasper Skaarhoj (kasperYYYY@typo3.com)
* All rights reserved
*
* This script is part of the TYPO3 project. The TYPO3 project is
$cmd = $this->app['pdfinfo'].' "'.$absFile.'"';
exec($cmd,$res);
$pdfInfo = $this->splitPdfInfo($res);
+ unset($res);
if (intval($pdfInfo['pages'])) {
list($low,$high) = explode('-',$cPKey);
$tempFileName = t3lib_div::tempnam('Typo3_indexer'); // Create temporary name
@unlink ($tempFileName); // Delete if exists, just to be safe.
$cmd = $this->app['pdftotext'].' -f '.$low.' -l '.$high.' -enc UTF-8 -q "'.$absFile.'" '.$tempFileName;
- exec($cmd,$res);
+ exec($cmd);
if (@is_file($tempFileName)) {
$content = t3lib_div::getUrl($tempFileName);
unlink($tempFileName);
$cmd = $this->app['catdoc'].' -d utf-8 "'.$absFile.'"';
exec($cmd,$res);
$content = implode(chr(10),$res);
+ unset($res);
$contentArr = $this->pObj->splitRegularContent($this->removeEndJunk($content));
}
break;
$cmd = $this->app['ppthtml'].' "'.$absFile.'"';
exec($cmd,$res);
$content = implode(chr(10),$res);
+ unset($res);
$content = $this->pObj->convertHTMLToUtf8($content);
$contentArr = $this->pObj->splitHTMLContent($this->removeEndJunk($content));
$contentArr['title'] = basename($absFile); // Make sure the title doesn't expose the absolute path!
$cmd = $this->app['xlhtml'].' -nc -te "'.$absFile.'"';
exec($cmd,$res);
$content = implode(chr(10),$res);
+ unset($res);
$content = $this->pObj->convertHTMLToUtf8($content);
$contentArr = $this->pObj->splitHTMLContent($this->removeEndJunk($content));
$contentArr['title'] = basename($absFile); // Make sure the title doesn't expose the absolute path!
case 'odt':
if ($this->app['unzip']) {
// Read content.xml:
- $cmd = $this->app['unzip'].' -p '.$absFile.' content.xml';
- exec($cmd,$out);
- $content_xml = implode(chr(10),$out);
+ $cmd = $this->app['unzip'].' -p "'.$absFile.'" content.xml';
+ exec($cmd,$res);
+ $content_xml = implode(chr(10),$res);
+ unset($res);
// Read meta.xml:
- $cmd = $this->app['unzip'].' -p '.$absFile.' meta.xml';
- exec($cmd, $out);
- $meta_xml = implode(chr(10),$out);
+ $cmd = $this->app['unzip'].' -p "'.$absFile.'" meta.xml';
+ exec($cmd, $res);
+ $meta_xml = implode(chr(10),$res);
+ unset($res);
$utf8_content = trim(strip_tags(str_replace('<',' <',$content_xml)));
$contentArr = $this->pObj->splitRegularContent($utf8_content);
$cmd = $this->app['unrtf'].' "'.$absFile.'"';
exec($cmd,$res);
$fileContent = implode(chr(10),$res);
+ unset($res);
$fileContent = $this->pObj->convertHTMLToUtf8($fileContent);
$contentArr = $this->pObj->splitHTMLContent($fileContent);
}
$cmd = $this->app['pdfinfo'].' "'.$absFile.'"';
exec($cmd,$res);
$pdfInfo = $this->splitPdfInfo($res);
+ unset($res);
if (intval($pdfInfo['pages'])) {
$cParts = array();