Index: t3lib/core_autoload.php
===================================================================
--- t3lib/core_autoload.php (revision 8055)
+++ t3lib/core_autoload.php (working copy)
@@ -4,7 +4,6 @@
return array(
- 'gzip_encode' => PATH_t3lib . 'class.gzip_encode.php',
't3lib_admin' => PATH_t3lib . 'class.t3lib_admin.php',
't3lib_ajax' => PATH_t3lib . 'class.t3lib_ajax.php',
't3lib_arraybrowser' => PATH_t3lib . 'class.t3lib_arraybrowser.php',
Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php (revision 8055)
+++ typo3/sysext/cms/tslib/class.tslib_content.php (working copy)
@@ -6787,20 +6787,6 @@
return $newVal;
}
- /**
- * Formats a number to GB, Mb or Kb or just bytes
- *
- * @param integer Number of bytes to format.
- * @param string Labels for bytes, kilo, mega and giga separated by vertical bar (|) and possibly encapsulated in "". Eg: " | K| M| G" (which is the default value)
- * @return string
- * @see t3lib_div::formatSize(), stdWrap()
- * @deprecated since TYPO3 3.6 - Use t3lib_div::formatSize() instead
- */
- function bytes($sizeInBytes,$labels) {
- t3lib_div::logDeprecatedFunction();
-
- return t3lib_div::formatSize($sizeInBytes,$labels);
- }
/**
* Returns the 'age' of the tstamp $seconds
@@ -6876,19 +6862,6 @@
}
}
- /**
- * Checking syntax of input email address
- *
- * @param string Input string to evaluate
- * @return boolean Returns true if the $email address (input string) is valid; Has a "@", domain name with at least one period and only allowed a-z characters.
- * @see t3lib_div::validEmail()
- * @deprecated since TYPO3 3.6 - Use t3lib_div::validEmail() instead
- */
- function checkEmail($email) {
- t3lib_div::logDeprecatedFunction();
-
- return t3lib_div::validEmail($email);
- }
/**
* Clears TypoScript properties listed in $propList from the input TypoScript array.
Index: typo3/sysext/indexed_search/class.indexer.php
===================================================================
--- typo3/sysext/indexed_search/class.indexer.php (revision 8055)
+++ typo3/sysext/indexed_search/class.indexer.php (working copy)
@@ -1339,19 +1339,6 @@
return $contentArr;
}
- /**
- * Processing words in the array from split*Content -functions
- * This function is only a wrapper because the function has been removed (see above).
- *
- * @param array Array of content to index, see splitHTMLContent() and splitRegularContent()
- * @return array Content input array modified so each key is not a unique array of words
- * @deprecated since TYPO3 4.0, this function will be removed in TYPO3 4.5.
- */
- function procesWordsInArrays($contentArr) {
- t3lib_div::logDeprecatedFunction();
-
- return $this->processWordsInArrays($contentArr);
- }
/**
* Extracts the sample description text from the content array.
@@ -2138,23 +2125,6 @@
return hexdec(substr(md5($str),0,7));
}
- /**
- * Calculates the cHash value of input GET array (for constructing cHash values if needed)
- *
- * @param array Array of GET parameters to encode
- * @return void
- * @deprecated since TYPO3 4.3, this function will be removed in TYPO3 4.5, use directly t3lib_div::calculateCHash()
- */
- function makeCHash($paramArray) {
- t3lib_div::logDeprecatedFunction();
-
- $addQueryParams = t3lib_div::implodeArrayForUrl('', $paramArray);
-
- $pA = t3lib_div::cHashParams($addQueryParams);
-
- return t3lib_div::shortMD5(serialize($pA));
- }
-
@@ -2218,21 +2188,6 @@
**************************/
/**
- * Frontend hook: If the page is not being re-generated this is our chance to force it to be (because re-generation of the page is required in order to have the indexer called!)
- *
- * @param array Parameters from frontend
- * @param object TSFE object (reference under PHP5)
- * @return void
- * @deprecated since TYPO3 4.3, this function will be removed in TYPO3 4.5, the method was extracted to hooks/class.tx_indexedsearch_tslib_fe_hook.php
- */
- function fe_headerNoCache(&$params, $ref) {
- t3lib_div::logDeprecatedFunction();
-
- require_once t3lib_extMgm::extPath('indexed_search') . 'hooks/class.tx_indexedsearch_tslib_fe_hook.php';
- t3lib_div::makeInstance('tx_indexedsearch_tslib_fe_hook')->headerNoCache($params, $ref);
- }
-
- /**
* Makes sure that keywords are space-separated. This is impotant for their
* proper displaying as a part of fulltext index.
*
Index: t3lib/class.t3lib_tstemplate.php
===================================================================
--- t3lib/class.t3lib_tstemplate.php (revision 8055)
+++ t3lib/class.t3lib_tstemplate.php (working copy)
@@ -1294,24 +1294,6 @@
return $outFile;
}
- /**
- * CheckFile runs through the $menuArr and checks every file-reference in $name
- * (Not used anywhere)
- *
- * @param string Property name in the menu array
- * @param array Menu array to traverse
- * @return array Modified menu array
- * @deprecated since TYPO3 3.6, this function will be removed in TYPO3 4.5.
- * @internal
- */
- function checkFile($name,$menuArr) {
- t3lib_div::logDeprecatedFunction();
-
- foreach ($menuArr as $aKey => $value) {
- $menuArr[$aKey][$name] = $this->getFileName($menuArr[$aKey][$name]);
- }
- return $menuArr;
- }
/**
* Compiles the content for the page
tag.
Index: typo3/sysext/cms/tslib/class.tslib_fe.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fe.php (revision 8055)
+++ typo3/sysext/cms/tslib/class.tslib_fe.php (working copy)
@@ -467,18 +467,6 @@
}
}
- /**
- * Connect to MySQL database
- * May exit after outputting an error message or some JavaScript redirecting to the install tool.
- *
- * @return void
- * @deprecated since TYPO3 3.8, this function will be removed in TYPO3 4.5, use connectToDB() instead!
- */
- function connectToMySQL() {
- t3lib_div::logDeprecatedFunction();
-
- $this->connectToDB();
- }
/**
* Connect to SQL database
@@ -3976,63 +3964,6 @@
}
}
- /**
- * Processes a query-string with GET-parameters and returns two strings, one with the parameters that CAN be encoded and one array with those which can't be encoded (encoded by the M5 or B6 methods)
- *
- * @param string Query string to analyse
- * @return array Two num keys returned, first is the parameters that MAY be encoded, second is the non-encodable parameters.
- * @see makeSimulFileName(), t3lib_tstemplate::linkData()
- * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.5, please use the "simulatestatic" sysext directly
- */
- function simulateStaticDocuments_pEnc_onlyP_proc($linkVars) {
- t3lib_div::logDeprecatedFunction();
-
- if (t3lib_extMgm::isLoaded('simulatestatic')) {
- return t3lib_div::callUserFunction(
- 'EXT:simulatestatic/class.tx_simulatestatic.php:&tx_simulatestatic->processEncodedQueryString',
- $linkVars,
- $this
- );
- } else {
- return false;
- }
- }
-
- /**
- * Returns the simulated static file name (*.html) for the current page (using the page record in $this->page)
- *
- * @return string The filename (without path)
- * @see makeSimulFileName(), publish.php
- * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.5, please use the "simulatestatic" sysext directly
- * @todo Deprecated but still used in the Core!
- */
- function getSimulFileName() {
- return $this->makeSimulFileName(
- $this->page['title'],
- ($this->page['alias'] ? $this->page['alias'] : $this->id),
- $this->type
- ) . '.html';
- }
-
- /**
- * Checks and sets replacement character for simulateStaticDocuments. Default is underscore.
- *
- * @return void
- * @deprecated since TYPO3 4.3, will be removed in TYPO3 4.5, please use the "simulatestatic" sysext directly
- */
- function setSimulReplacementChar() {
- t3lib_div::logDeprecatedFunction();
-
- $replacement = $defChar = t3lib_div::compat_version('4.0') ? '-' : '_';
- if (isset($this->config['config']['simulateStaticDocuments_replacementChar'])) {
- $replacement = trim($this->config['config']['simulateStaticDocuments_replacementChar']);
- if (urlencode($replacement) != $replacement) {
- // Invalid character
- $replacement = $defChar;
- }
- }
- $this->config['config']['simulateStaticDocuments_replacementChar'] = $replacement;
- }
/**
* Converts input string to an ASCII based file name prefix
@@ -4536,19 +4467,6 @@
}
}
- /**
- * Seeds the random number engine.
- *
- * @return void
- * @deprecated since TYPO3 4.3, this function will be removed in TYPO3 4.5, the random number generator is seeded automatically since PHP 4.2.0
- */
- function make_seed() {
- t3lib_div::logDeprecatedFunction();
-
- list($usec, $sec) = explode(' ', microtime());
- $seedV = (float)$sec + ((float)$usec * 100000);
- srand($seedV);
- }
/**
* Returns a unique md5 hash.
Index: t3lib/class.t3lib_db.php
===================================================================
--- t3lib/class.t3lib_db.php (revision 8055)
+++ t3lib/class.t3lib_db.php (working copy)
@@ -882,27 +882,7 @@
*
**************************************/
- /**
- * Executes query
- * mysql() wrapper function
- * Usage count/core: 0
- *
- * @param string Database name
- * @param string Query to execute
- * @return pointer Result pointer / DBAL object
- * @deprecated since TYPO3 3.6, will be removed in TYPO3 4.5
- * @see sql_query()
- */
- function sql($db, $query) {
- t3lib_div::logDeprecatedFunction();
-
- $res = mysql_query($query, $this->link);
- if ($this->debugOutput) {
- $this->debug('sql', $query);
- }
- return $res;
- }
-
+
/**
* Executes query
* mysql_query() wrapper function
Index: t3lib/class.t3lib_install.php
===================================================================
--- t3lib/class.t3lib_install.php (revision 8055)
+++ t3lib/class.t3lib_install.php (working copy)
@@ -1040,18 +1040,6 @@
return $content;
}
- /**
- * Reads the field definitions for the input SQL-file string
- *
- * @param string Should be a string read from an SQL-file made with 'mysqldump [database_name] -d'
- * @return array Array with information about table.
- * @deprecated since TYPO3 4.2, this function will be removed in TYPO3 4.5, use ->getFieldDefinitions_fileContent() instead!
- */
- function getFieldDefinitions_sqlContent($fileContent) {
- t3lib_div::logDeprecatedFunction();
-
- return $this->getFieldDefinitions_fileContent($fileContent);
- }
}
if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_install.php']) {
Index: typo3/class.db_list_extra.inc
===================================================================
--- typo3/class.db_list_extra.inc (revision 8055)
+++ typo3/class.db_list_extra.inc (working copy)
@@ -765,28 +765,7 @@
}
}
- /**
- * Write sys_refindex entries for current record to $this->references
- *
- * @param string Table name
- * @param integer Uid of current record
- * @return void
- *
- * @deprecated since 4.4: Use getReferenceCount instead
- */
- function setReferences($table, $uid) {
- t3lib_div::logDeprecatedFunction();
-
- $rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
- 'tablename, recuid, field',
- 'sys_refindex',
- 'ref_table='.$GLOBALS['TYPO3_DB']->fullQuoteStr($table,'sys_refindex').
- ' AND ref_uid='.intval($uid).
- ' AND deleted=0'
- );
- $this->references = $rows;
- }
-
+
/**
* Gets the number of records referencing the record with the UID $uid in
* the table $tableName.
@@ -1467,28 +1446,6 @@
'.implode('',$cells).'
';
}
- /**
- * Make reference count
- *
- * @param string Table name
- * @param integer UID of record
- * @return string HTML-table
- *
- * @deprecated since 4.4: Use getReferenceHTML() instead
- */
- function makeRef($table,$uid) {
- t3lib_div::logDeprecatedFunction();
-
- // Compile information for title tag:
- $infoData=array();
- if (is_array($this->references)) {
- foreach ($this->references as $row) {
- $infoData[]=$row['tablename'].':'.$row['recuid'].':'.$row['field'];
- }
- }
-
- return count($infoData) ? ''.count($infoData).'' : '';
- }
/**
* Creates the HTML for a reference count for the record with the UID $uid
Index: t3lib/class.t3lib_timetrack.php
===================================================================
--- t3lib/class.t3lib_timetrack.php (revision 8055)
+++ t3lib/class.t3lib_timetrack.php (working copy)
@@ -253,31 +253,6 @@
$this->tsStackPointer--;
}
- /**
- * Returns the current time in milliseconds
- *
- * @return integer
- * @deprecated since TYPO3 4.3, this function will be removed in TYPO3 4.5, use getDifferenceToStarttime() instead
- */
- protected function mtime() {
- t3lib_div::logDeprecatedFunction();
-
- return $this->getDifferenceToStarttime();
- }
-
- /**
- * Returns microtime input to milliseconds
- *
- * @param string PHP microtime string
- * @return integer
- * @deprecated since TYPO3 4.3, this function will be removed in TYPO3 4.5, use getMilliseconds() instead that expects microtime as float instead of a string
- */
- public function convertMicrotime($microtime) {
- t3lib_div::logDeprecatedFunction();
-
- $parts = explode(' ',$microtime);
- return round(($parts[0]+$parts[1])*1000);
- }
/**
* Gets a microtime value as milliseconds value.
Index: t3lib/class.t3lib_div.php
===================================================================
--- t3lib/class.t3lib_div.php (revision 8055)
+++ t3lib/class.t3lib_div.php (working copy)
@@ -371,41 +371,6 @@
}
}
- /**
- * Returns the value of incoming data from globals variable $_POST or $_GET, with priority to $_POST (that is equalent to 'GP' order).
- * Strips slashes of string-outputs, but not arrays UNLESS $strip is set. If $strip is set all output will have escaped characters unescaped.
- * Usage: 2
- *
- * @param string GET/POST var to return
- * @param boolean If set, values are stripped of return values that are *arrays!* - string/integer values returned are always strip-slashed()
- * @return mixed POST var named $var and if not set, the GET var of the same name.
- * @deprecated since TYPO3 3.6 - Use t3lib_div::_GP instead (ALWAYS delivers a value with un-escaped values!)
- * @see _GP()
- */
- public static function GPvar($var,$strip=0) {
- self::logDeprecatedFunction();
-
- if(empty($var)) return;
- $value = isset($_POST[$var]) ? $_POST[$var] : $_GET[$var];
- if (isset($value) && is_string($value)) { $value = stripslashes($value); } // Originally check '&& get_magic_quotes_gpc() ' but the values of $_GET are always slashed regardless of get_magic_quotes_gpc() because HTTP_POST/GET_VARS are run through addSlashesOnArray in the very beginning of index_ts.php eg.
- if ($strip && isset($value) && is_array($value)) { self::stripSlashesOnArray($value); }
- return $value;
- }
-
- /**
- * Returns the global arrays $_GET and $_POST merged with $_POST taking precedence.
- * Usage: 1
- *
- * @param string Key (variable name) from GET or POST vars
- * @return array Returns the GET vars merged recursively onto the POST vars.
- * @deprecated since TYPO3 3.7 - Use t3lib_div::_GPmerged instead
- * @see _GP()
- */
- public static function GParrayMerged($var) {
- self::logDeprecatedFunction();
-
- return self::_GPmerged($var);
- }
/**
* Wrapper for the RemoveXSS function.
@@ -545,51 +510,6 @@
*
*************************/
- /**
- * Truncates string.
- * Returns a new string of max. $chars length.
- * If the string is longer, it will be truncated and appended with '...'.
- * Usage: 39
- *
- * @param string string to truncate
- * @param integer must be an integer with an absolute value of at least 4. if negative the string is cropped from the right end.
- * @param string String to append to the output if it is truncated, default is '...'
- * @return string new string
- * @deprecated since TYPO3 4.1 - Works ONLY for single-byte charsets! Use t3lib_div::fixed_lgd_cs() instead
- * @see fixed_lgd_pre()
- */
- public static function fixed_lgd($string,$origChars,$preStr='...') {
- self::logDeprecatedFunction();
-
- $chars = abs($origChars);
- if ($chars >= 4) {
- if(strlen($string)>$chars) {
- return $origChars < 0 ?
- $preStr.trim(substr($string, -($chars-3))) :
- trim(substr($string, 0, $chars-3)).$preStr;
- }
- }
- return $string;
- }
-
- /**
- * Truncates string.
- * Returns a new string of max. $chars length.
- * If the string is longer, it will be truncated and prepended with '...'.
- * This works like fixed_lgd(), but is truncated in the start of the string instead of the end
- * Usage: 6
- *
- * @param string string to truncate
- * @param integer must be an integer of at least 4
- * @return string new string
- * @deprecated since TYPO3 4.1 - Use either fixed_lgd() or fixed_lgd_cs() (with negative input value for $chars)
- * @see fixed_lgd()
- */
- public static function fixed_lgd_pre($string,$chars) {
- self::logDeprecatedFunction();
-
- return strrev(self::fixed_lgd(strrev($string),$chars));
- }
/**
* Truncates a string with appended/prepended "..." and takes current character set into consideration.
@@ -613,26 +533,6 @@
}
}
- /**
- * Breaks up the text for emails
- * Usage: 1
- *
- * @param string The string to break up
- * @param string The string to implode the broken lines with (default/typically \n)
- * @param integer The line length
- * @deprecated since TYPO3 4.1 - Use PHP function wordwrap()
- * @return string
- */
- public static function breakTextForEmail($str,$implChar=LF,$charWidth=76) {
- self::logDeprecatedFunction();
-
- $lines = explode(LF,$str);
- $outArr=array();
- foreach ($lines as $lStr) {
- $outArr[] = self::breakLinesForEmail($lStr,$implChar,$charWidth);
- }
- return implode(LF,$outArr);
- }
/**
* Breaks up a single line of text for emails
@@ -1221,39 +1121,6 @@
return rtrim($string, ',');
}
- /**
- * strtoupper which converts danish (and other characters) characters as well
- * Usage: 0
- *
- * @param string String to process
- * @return string
- * @deprecated since TYPO3 3.5 - Use t3lib_cs::conv_case() instead or for HTML output, wrap your content in ...)
- * @ignore
- */
- public static function danish_strtoupper($string) {
- self::logDeprecatedFunction();
-
- $value = strtoupper($string);
- return strtr($value, 'áéúíâêûôîæøåäöü', 'ÁÉÚÍÄËÜÖÏÆØÅÄÖÜ');
- }
-
- /**
- * Change umlaut characters to plain ASCII with normally two character target
- * Only known characters will be converted, so don't expect a result for any character.
- *
- * ä => ae, Ö => Oe
- *
- * @param string String to convert.
- * @deprecated since TYPO3 4.1 - Works only for western europe single-byte charsets! Use t3lib_cs::specCharsToASCII() instead!
- * @return string
- */
- public static function convUmlauts($str) {
- self::logDeprecatedFunction();
-
- $pat = array ( '/ä/', '/Ä/', '/ö/', '/Ö/', '/ü/', '/Ü/', '/ß/', '/å/', '/Å/', '/ø/', '/Ø/', '/æ/', '/Æ/' );
- $repl = array ( 'ae', 'Ae', 'oe', 'Oe', 'ue', 'Ue', 'ss', 'aa', 'AA', 'oe', 'OE', 'ae', 'AE' );
- return preg_replace($pat,$repl,$str);
- }
/**
* Tests if the input is an integer.
@@ -1780,20 +1647,6 @@
return $result;
}
- /**
- * Remove duplicate values from an array
- * Usage: 0
- *
- * @param array Array of values to make unique
- * @return array
- * @ignore
- * @deprecated since TYPO3 3.5 - Use the PHP function array_unique instead
- */
- public static function uniqueArray(array $valueArray) {
- self::logDeprecatedFunction();
-
- return array_unique($valueArray);
- }
/**
* Removes the value $cmpValue from the $array if found there. Returns the modified array
@@ -2102,20 +1955,7 @@
return $str;
}
- /**
- * Creates recursively a JSON literal from a multidimensional associative array.
- * Uses native function of PHP >= 5.2.0
- *
- * @param array $jsonArray: The array to be transformed to JSON
- * @return string JSON string
- * @deprecated since TYPO3 4.3, use PHP native function json_encode() instead, will be removed in TYPO3 4.5
- */
- public static function array2json(array $jsonArray) {
- self::logDeprecatedFunction();
-
- return json_encode($jsonArray);
- }
-
+
/**
* Removes dots "." from end of a key identifier of TypoScript styled array.
* array('key.' => array('property.' => 'value')) --> array('key' => array('property' => 'value'))
@@ -2250,21 +2090,6 @@
return implode(' ',$list);
}
- /**
- * Implodes attributes in the array $arr for an attribute list in eg. and HTML tag (with quotes)
- *
- * @param array See implodeAttributes()
- * @param boolean See implodeAttributes()
- * @param boolean See implodeAttributes()
- * @return string See implodeAttributes()
- * @deprecated since TYPO3 3.7 - Name was changed into implodeAttributes
- * @see implodeAttributes()
- */
- public static function implodeParams(array $arr,$xhtmlSafe=FALSE,$dontOmitBlankAttribs=FALSE) {
- self::logDeprecatedFunction();
-
- return self::implodeAttributes($arr,$xhtmlSafe,$dontOmitBlankAttribs);
- }
/**
* Wraps JavaScript code XHTML ready with